meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-11 03:33:07 +00:00
Code Issues Releases Wiki Activity
13,529 Commits 32 Branches 194 Tags
Commit Graph

2603 Commits

Author SHA1 Message Date
Jean-Philippe Lang
3644d67fb8 Merged r17643 to 3.4-stable (#20788). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17650 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-29 15:40:53 +00:00
Go MAEDA
a046f0db7b Merged r17638 from trunk to 3.4-stable (#30009). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17639 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-26 05:44:35 +00:00
Go MAEDA
a7f6830a8e Merged r17636 from trunk to 3.4-stable (#8395). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17637 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-26 04:56:19 +00:00
Go MAEDA
fad54d02b8 Merged r17630 from trunk to 3.4-stable (#28576). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17631 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-24 11:20:00 +00:00
Go MAEDA
9b7efd00e8 Merged r17625 from trunk to 3.4-stable (#8317). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17627 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-10 23:02:47 +00:00
Go MAEDA
042dd66527 Merged r17603 from trunk to 3.4-stable (#29756). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17604 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-10-28 11:04:15 +00:00
Go MAEDA
375c7adfe4 Merged r17450 from trunk to 3.4-stable (#29247). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17451 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-07-21 00:17:51 +00:00
Go MAEDA
53f6578b5a Merged r17436 from trunk to 3.4-stable (#29133). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17437 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-07-08 07:26:11 +00:00
Go MAEDA
c999dacf0c Merged r17432 from trunk to 3.4-stable (#29191). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17433 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-07-06 01:38:33 +00:00
Go MAEDA
a3570ff62b Merged r17428 from trunk to 3.4-stable (#29038). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17429 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-07-02 03:03:12 +00:00
Go MAEDA
f2843a26d0 Merged r17390 from trunk to 3.4-stable (#28946). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17391 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-06-17 01:07:38 +00:00
Jean-Philippe Lang
92bc4919eb Merged r17373 to 3.4-stable (#28649). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17374 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-06-10 06:00:18 +00:00
Go MAEDA
c103a59465 Merged r17368 from trunk to 3.4-stable (#27863). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17369 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-06-07 00:37:12 +00:00
Go MAEDA
929d8b27b2 Merged r17342 from trunk to 3.4-stable (#28765). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17343 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-05-19 01:31:35 +00:00
Go MAEDA
941eb22e99 Merged r17322 from trunk to 3.4-stable (#28469). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17323 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-05-02 02:29:40 +00:00
Go MAEDA
20d16fdba0 Merged r17316 from trunk to 3.4-stable (#27122). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17317 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-04-28 23:52:00 +00:00
Jean-Philippe Lang
db5d241870 Merged test from r17263 into 3.4-stable (#28208). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17275 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-04-07 08:15:17 +00:00
Jean-Philippe Lang
578a9e67d3 Merged r17269 into 3.4-stable (#28302). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17270 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-04-07 07:50:30 +00:00
Jean-Philippe Lang
7d0cbd0d9b Merged r17266 into 3.4-stable (#25299). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17267 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-04-07 07:43:22 +00:00
Go MAEDA
220a961dd4 Merged r17257 from trunk to 3.4-stable (#28180). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17258 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-04-07 00:31:57 +00:00
Go MAEDA
12a420b8c9 Merged r17198 to 3.4-stable (#28119). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17247 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-03-31 05:31:27 +00:00
Go MAEDA
0037cef83d 3.4-stable: Too large avatar breaks gantt when assignee is a group (#28204). 
Patch by Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17202 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-02-18 05:21:22 +00:00
Jean-Philippe Lang
cffc5d7026 Merged r17158 to 3.4-stable (#26705). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17159 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-01-08 17:52:19 +00:00
Jean-Philippe Lang
c3da53217c Merged r17150 to 3.4-stable (#26699). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17151 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-01-07 22:05:47 +00:00
Jean-Philippe Lang
19fdcd7a1f Merged r17147 to 3.4-stable (#27885). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@17148 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-01-07 21:47:48 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
Toshi MARUYAMA
1d4300b674 remove trailing white-space from test/unit/mailer_test.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@16584 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-05-30 18:18:18 +00:00
Toshi MARUYAMA
153409d30f remove trailing white-spaces from test/unit/issue_subtasking_test.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@16579 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-05-27 16:26:41 +00:00