Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-01-21 23:13:04 +01:00
Code Issues Packages Projects Releases Activity
13,453 Commits 35 Branches 225 Tags
e8bc1dbaa80dd714254da9c19e4ffaae4fbf9736
Commit Graph

4789 Commits

Author SHA1 Message Date
Jean-Philippe Lang
e8bc1dbaa8 Merged r17144 to 3.4-stable (#27881). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17145 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-01-07 21:43:04 +00:00
Go MAEDA
d0ec0508ad Merged r17113 to 3.4-stable (#22532). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17114 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-13 14:07:15 +00:00
Go MAEDA
aae275b4c6 Merged r17078 to 3.4-stable (#27754). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17079 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-09 02:43:09 +00:00
Toshi MARUYAMA
f093d591f1 Merged r17062 from trunk to 3.4-stable (#27516) 
mercurial: work around faulty parsing of early command options

Use -sVALUE and --long=VALUE instead of "-s VALUE" and "--long VALUE"
respectively.

Contributed by Yuya Nishihara.

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17068 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-07 12:16:07 +00:00
Toshi MARUYAMA
76dd10bd78 Merged r17060 from trunk to 3.4-stable (#27516) 
mercurial: reject malicious command argument

We've got a security report from the Phabricator team, which basically says
--config and --debugger arguments can be injected anywhere to lead to an
arbitrary command execution.

https://secure.phabricator.com/rPa7921a4448093d00defa8bd18f35b8c8f8bf3314

This is a fundamental issue of the argument parsing rules in Mercurial, which
allows extensions to populate their parsing rules and such extensions can be
loaded by "--config extensions.<name>=". There's a chicken and egg problem.
We're working on hardening the parsing rules, but which won't come in by
default as it would be a behavior change.

This patch adds a verification to reject malicious command arguments as a
last ditch. The subsequent patches will fix the problem in more appropriate
way.

Contributed by Yuya Nishihara.

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17066 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-07 12:15:45 +00:00
Go MAEDA
2e8d269c05 Merged r17056 to 3.4-stable (#27663). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17057 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-06 13:23:52 +00:00
Jean-Philippe Lang
4254148986 Editing issues no longer sends notifications to previous assignee (#26627). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17002 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-10-15 16:43:19 +00:00
Jean-Philippe Lang
80cf4fd5db Merged r16999 and r17000 (#26667). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17001 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-10-15 11:56:05 +00:00
Jean-Philippe Lang
f793340077 Merged r16997 (#26667). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16998 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-10-15 11:42:32 +00:00
Jean-Philippe Lang
9e16fcf3f3 Merged r16924 and r16925 (#26520). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16989 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-10-15 11:17:33 +00:00
Toshi MARUYAMA
497d0f3476 Merged r16957 from trunk to 3.4-stable (#26599) 
fix file name corruption when export a wiki page with non-ASCII title in MS browsers.

Contributed by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16959 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-08-30 16:37:21 +00:00
Toshi MARUYAMA
ec8d589246 Merged r16938 from trunk to 3.4-stable (#22320) 
try IssueTest#test_overdue failing on CI server at Japanese daytime.

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16951 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-08-09 06:36:29 +00:00
Jean-Philippe Lang
f3e420c802 Merged r16926. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16927 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-07-30 17:10:08 +00:00
Jean-Philippe Lang
df59bff52f Merged r16918 and r16919 (#26564). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16920 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-07-30 16:32:08 +00:00
Toshi MARUYAMA
d378343c23 Merged r16894 from trunk to 3.4-stable 
add missing fixture for IssueTest#test_update_should_notify_previous_assignee

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16895 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-07-27 07:21:56 +00:00
Jean-Philippe Lang
6c85506746 Merged r16874. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16888 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-07-25 17:55:15 +00:00
Jean-Philippe Lang
e8237a8bc7 Merged r16839 (#26471). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16845 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-07-22 07:11:26 +00:00
Jean-Philippe Lang
bf149a63c0 Merged r16823 (#26445). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16824 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-07-16 18:04:00 +00:00
Jean-Philippe Lang
e57b5ddbcc Merged r16808 (#26387). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16818 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-07-16 11:48:44 +00:00
Jean-Philippe Lang
7e9805aa95 Merged r16812 (#26393). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16817 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-07-16 11:47:55 +00:00
Jean-Philippe Lang
66f6bf0e8d Merged r16766 to r16768 (#26376). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16771 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-07-08 12:56:27 +00:00
Jean-Philippe Lang
0705c839d9 Merged r16762 (#26350). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16763 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-07-06 16:45:34 +00:00
Jean-Philippe Lang
a3eb6bf1f7 Merged r16738 (#26310, #25988). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16739 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-07-02 10:00:07 +00:00
Toshi MARUYAMA
8321fe9a84 Merged r16734 from trunk to 3.4-stable (#26311). 
Update remaining copyrights.

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16735 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-07-02 07:11:56 +00:00
Jean-Philippe Lang
85131b5655 Merged r16721 (#7068). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16723 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-26 19:57:36 +00:00
Jean-Philippe Lang
f35b9a7968 Merged r16718 (#14790). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16719 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-26 19:31:25 +00:00
Jean-Philippe Lang
7fd04e1f8d Update copyright. 
git-svn-id: http://svn.redmine.org/redmine/trunk@16685 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-25 08:40:31 +00:00
Toshi MARUYAMA
04fa679cb8 add test of email reminder in case of user language is 'auto' (#26247) 
git-svn-id: http://svn.redmine.org/redmine/trunk@16682 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-23 16:46:05 +00:00
Toshi MARUYAMA
2b24a617e1 code layout cleanup test/unit/custom_field_test.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@16678 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-19 05:38:48 +00:00
Toshi MARUYAMA
741fff9956 code layout cleanup test/unit/mail_handler_test.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@16677 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-19 05:38:36 +00:00
Jean-Philippe Lang
580b591c57 Add download link to no preview message (#26035). 
Patch by Jan Schulz-Hofen.

git-svn-id: http://svn.redmine.org/redmine/trunk@16673 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-17 09:51:19 +00:00
Jean-Philippe Lang
7017874cc9 Link to user by id (#4179). 
Patch by Marius BALTEANU.

git-svn-id: http://svn.redmine.org/redmine/trunk@16671 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-17 08:48:23 +00:00
Jean-Philippe Lang
b21af3eaa4 Preview files by default instead of downloading them (#25988). 
Patch by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@16665 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-17 07:28:10 +00:00
Toshi MARUYAMA
ef754487c3 remove trailing white spaces from test/functional/trackers_controller_test.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@16664 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-15 04:36:36 +00:00
Jean-Philippe Lang
fc2b4cfc3c Adds a test for wiki destroy confirmation. 
git-svn-id: http://svn.redmine.org/redmine/trunk@16661 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-10 23:55:51 +00:00
Jean-Philippe Lang
e29b0da1c8 Adds tests for #25775. 
git-svn-id: http://svn.redmine.org/redmine/trunk@16656 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-10 12:18:09 +00:00
Jean-Philippe Lang
d66dc72d69 Rename a few tests. 
git-svn-id: http://svn.redmine.org/redmine/trunk@16653 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-10 10:50:06 +00:00
Jean-Philippe Lang
4d4f330b0c Highlight menu item when viewing an attachment (#25988). 
git-svn-id: http://svn.redmine.org/redmine/trunk@16652 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-10 10:48:34 +00:00
Toshi MARUYAMA
01defc7514 remove trailing white spaces from test/functional/wiki_controller_test.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@16645 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-10 04:55:17 +00:00
Jean-Philippe Lang
9b0fcdaf2b New permission: view news (#7068). 
Patch by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/trunk@16639 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-07 20:25:25 +00:00
Jean-Philippe Lang
b674e80128 New Permission: View Forum (#4866). 
Patch by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/trunk@16637 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-07 20:20:22 +00:00
Jean-Philippe Lang
f902860955 Link to user in wiki syntax (#4179). 
Patch by Marius BALTEANU.

git-svn-id: http://svn.redmine.org/redmine/trunk@16636 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-07 20:10:57 +00:00
Jean-Philippe Lang
c513037c6e DOn't show time entries when query is invalid (#23912). 
git-svn-id: http://svn.redmine.org/redmine/trunk@16635 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-07 19:56:22 +00:00
Jean-Philippe Lang
24c2416ffe Tests for Redmine::SyntaxHighlighting::CodeRay.retrieve_supported_languages (#26055). 
Patch by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@16625 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-06 21:56:56 +00:00
Jean-Philippe Lang
b997f03211 Set default assignee before validation (#26072). 
git-svn-id: http://svn.redmine.org/redmine/trunk@16619 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-06 21:11:37 +00:00
Toshi MARUYAMA
0fbfcfafe9 remove trailing white space from test/functional/workflows_controller_test.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@16612 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-06 04:57:39 +00:00
Toshi MARUYAMA
c02c9ac1f7 remove trailing white space from test/unit/project_nested_set_test.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@16610 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-06 02:12:24 +00:00
Toshi MARUYAMA
8c03f2a6db allow unicode whitespace after mail handler body delimiters (#17718) 
Contributed by Holger Just and Marius BALTEANU.

git-svn-id: http://svn.redmine.org/redmine/trunk@16609 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-06 01:34:52 +00:00
Jean-Philippe Lang
6ca3e4f75f Use strong params for CustomFieldEnumeration. 
git-svn-id: http://svn.redmine.org/redmine/trunk@16603 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-03 08:43:04 +00:00
Jean-Philippe Lang
44c748f968 Use regular instance methods instead of association extensions. 
Rails 5.1 seems to mess things up in this particular case (role.workflow_rules.copy calls the extension declare in Tracker model).

git-svn-id: http://svn.redmine.org/redmine/trunk@16597 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-03 08:04:13 +00:00