Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-07 22:05:56 +01:00
Code Issues Packages Projects Releases Activity
12,701 Commits 35 Branches 222 Tags
5e4f49c8ad1eb3154dca1995c833e47e901b6e24
Commit Graph

1843 Commits

Author SHA1 Message Date
Jean-Philippe Lang
899fc2e0cd Merged r18247 to 3.3-stable (#31520). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@19075 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2019-11-16 09:47:01 +00:00
Jean-Philippe Lang
1734cbf787 Updates for 3.3.9 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17709 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-12-09 06:36:08 +00:00
Jean-Philippe Lang
997a7e8870 Reverts r17655 (#29674). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17662 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-29 19:08:50 +00:00
Jean-Philippe Lang
f2b0e224a1 Merged r17645 to 3.3-stable (#29674). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17655 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-29 15:44:32 +00:00
Jean-Philippe Lang
cf588edbea Merged r17643 to 3.3-stable (#20788). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17651 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-29 15:41:34 +00:00
Go MAEDA
a9ea3c4e15 Merged r17625 from trunk to 3.3-stable (#8317). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17628 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-11-11 00:50:58 +00:00
Go MAEDA
565c4ed128 Merged r17474 from trunk to 3.3-stable (#29413). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17476 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-08-25 09:48:14 +00:00
Jean-Philippe Lang
b849ebab64 Updates for 3.3.8 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17379 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-06-10 06:15:33 +00:00
Go MAEDA
1be0351fc0 Merged r17351 from trunk to 3.3-stable (#28725). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17353 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-05-28 11:53:04 +00:00
Go MAEDA
ffd9a00756 Merged r17322 from trunk to 3.3-stable (#28469). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17324 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-05-02 02:30:36 +00:00
Jean-Philippe Lang
32e9ec868d Updates for 3.3.7 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17288 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-04-07 12:27:11 +00:00
Jean-Philippe Lang
d4d750ccae Merged r17266 into 3.3-stable (#25299). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17268 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-04-07 07:46:12 +00:00
Go MAEDA
b0b271283d Merged r17198 to 3.3-stable (#28119). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17248 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-03-31 05:31:54 +00:00
Jean-Philippe Lang
1db07f19c6 Updates for 3.3.6 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17164 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2018-01-08 18:00:06 +00:00
Toshi MARUYAMA
5a2c8f57a7 Merged r17062 from trunk to 3.3-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.3-stable@17072 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-07 12:19:39 +00:00
Toshi MARUYAMA
06e52a746c Merged r17061 from trunk to 3.3-stable (#27516) 
mercurial: separate command options and positional arguments with "--"

We don't have much problems here thanks to hgtarget(path) and CGI.escape(),
which prepends a repository path and encodes "=" character respectively, but
it's better to not rely on the side effect of these functions.

Contributed by Yuya Nishihara.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17071 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-07 12:19:27 +00:00
Toshi MARUYAMA
feb8c98e1b Merged r17060 from trunk to 3.3-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.3-stable@17070 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-07 12:19:13 +00:00
Toshi MARUYAMA
ccefedfbf2 Merged r16421 from trunk to 3.3-stable. 
set "warning = false" for "rake test:scm:units" and "rake test:scm:functionals"

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17069 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-12-07 12:19:02 +00:00
Go MAEDA
0f0865a31f Merged r17027 to 3.3-stable (#26410). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17029 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-11-25 15:38:09 +00:00
Jean-Philippe Lang
03e68482e2 Updates for 3.3.5 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17006 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-10-15 19:52:18 +00:00
Toshi MARUYAMA
d48d0b6cf1 Merged r16948 from trunk to 3.3-stable (#26645) 
git: remove "--no-color" option from "git --version" for git 2.14 compatibility.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16950 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-08-08 06:24:05 +00:00
Jean-Philippe Lang
5938d080d1 Updates for 3.3.4 release. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16746 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-07-02 11:55:40 +00:00
Jean-Philippe Lang
49108983cb Merged r16622 to r16625 (#26055). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16630 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-07 19:35:27 +00:00
Jean-Philippe Lang
f561ffd5e9 Merged r16574 (#25760). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16620 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-06-06 21:17:08 +00:00
Jean-Philippe Lang
e24ba3b907 Merged r16568 (#25634). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16570 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-05-27 08:36:05 +00:00
Jean-Philippe Lang
aef65ffe63 Merged r16532. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16533 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-09 08:28:38 +00:00
Jean-Philippe Lang
ec59ffc8f3 Merged r16500 to r16503 (#25503). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16523 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-04-08 07:45:20 +00:00
Toshi MARUYAMA
d373a95c04 Merged r16428 from trunk to 3.3-stable (#25371) 
git: use '--no-renames' option in 'show' command.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16429 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-03-24 16:15:46 +00:00
Toshi MARUYAMA
dbc64d0b8e Merged r16422 from trunk to 3.3-stable (#25371) 
Git 2.9 compatibility.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16424 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-03-20 18:03:42 +00:00
Jean-Philippe Lang
540237033e Merged r16341 (#25115). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16342 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-02-28 20:00:17 +00:00
Toshi MARUYAMA
ab0fa04b62 Merged r16329 from trunk to 3.3-stable (#24999) 
Mercurial 4.1 compatibility.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16330 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-02-05 05:53:30 +00:00
Jean-Philippe Lang
730f1c3071 Merged r16227 (#24869). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16290 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-29 10:25:29 +00:00
Jean-Philippe Lang
d4dcd3a8dc Merged r16092. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16145 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-07 08:40:28 +00:00
Jean-Philippe Lang
2551d68c1f Merged r16142 (3.3.2 release). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16143 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2017-01-07 08:37:58 +00:00
Jean-Philippe Lang
9b235e7d7b Merged r15958 (#24296). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16005 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-11-26 09:05:30 +00:00
Jean-Philippe Lang
7189fdbf0c Merged r15950 (#24348). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16001 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-11-26 09:02:26 +00:00
Jean-Philippe Lang
947faf23a0 Merged r15898. 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15899 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-10 07:45:42 +00:00
Jean-Philippe Lang
9fa491f9f0 Merged r15813 (#23587). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15878 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-02 10:23:06 +00:00
Jean-Philippe Lang
c6e20372fd Merged r15846 (#23841). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15867 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-10-02 10:12:19 +00:00
Jean-Philippe Lang
30223b3043 Merged r15645 (#23269). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15746 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-08-20 11:55:29 +00:00
Jean-Philippe Lang
f231779252 Merged r15609 (#23278). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15637 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-07-11 18:09:54 +00:00
Jean-Philippe Lang
0b67170baf Merged r15607 (#23246). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15614 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-07-10 07:46:52 +00:00
Jean-Philippe Lang
11b7b573df Merged r15547 and r15561 (#23020). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15566 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-18 10:57:22 +00:00
Jean-Philippe Lang
1f79610fdc Merged r15536 and r15541 (#23083). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15560 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-18 10:18:40 +00:00
Jean-Philippe Lang
5169055276 Merged r15539 and r15550 (#23067). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15557 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-18 10:16:43 +00:00
Jean-Philippe Lang
748fd10893 Merged r15501 to r15508 (#15880). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15513 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-12 05:50:26 +00:00
Jean-Philippe Lang
6e68d008c4 Merged 15430, 15464 to 15469, 15475, 15476 (#285, #7839). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15478 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-06 09:41:50 +00:00
Jean-Philippe Lang
cdfebdcec8 Merged r15442 (#22898). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15444 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-04 09:56:44 +00:00
Jean-Philippe Lang
8c09e330d4 Merged r15431 to r15435 (#22924, #22925, #22926). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15440 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-04 07:24:45 +00:00
Jean-Philippe Lang
961c0e0de9 Merged r15429 (#22911). 
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15438 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2016-06-04 07:19:20 +00:00