summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Updates for 3.3.9 release.Jean-Philippe Lang2018-12-091-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17709 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Reverts r17655 (#29674).Jean-Philippe Lang2018-11-291-10/+0
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17662 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17645 to 3.3-stable (#29674).Jean-Philippe Lang2018-11-291-0/+10
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17655 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17643 to 3.3-stable (#20788).Jean-Philippe Lang2018-11-291-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17651 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17625 from trunk to 3.3-stable (#8317).Go MAEDA2018-11-111-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17628 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17474 from trunk to 3.3-stable (#29413).Go MAEDA2018-08-251-2/+4
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17476 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Updates for 3.3.8 release.Jean-Philippe Lang2018-06-101-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17379 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17351 from trunk to 3.3-stable (#28725).Go MAEDA2018-05-281-4/+15
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17353 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17322 from trunk to 3.3-stable (#28469).Go MAEDA2018-05-021-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17324 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Updates for 3.3.7 release.Jean-Philippe Lang2018-04-071-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17288 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17266 into 3.3-stable (#25299).Jean-Philippe Lang2018-04-071-8/+6
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17268 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17198 to 3.3-stable (#28119).Go MAEDA2018-03-311-1/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17248 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Updates for 3.3.6 release.Jean-Philippe Lang2018-01-081-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17164 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r17062 from trunk to 3.3-stable (#27516)Toshi MARUYAMA2017-12-071-13/+14
| | | | | | | | | | | 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
* Merged r17061 from trunk to 3.3-stable (#27516)Toshi MARUYAMA2017-12-071-5/+5
| | | | | | | | | | | | 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
* Merged r17060 from trunk to 3.3-stable (#27516)Toshi MARUYAMA2017-12-071-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | 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
* Merged r16421 from trunk to 3.3-stable.Toshi MARUYAMA2017-12-071-0/+2
| | | | | | 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
* Merged r17027 to 3.3-stable (#26410).Go MAEDA2017-11-251-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17029 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Updates for 3.3.5 release.Jean-Philippe Lang2017-10-151-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17006 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16948 from trunk to 3.3-stable (#26645)Toshi MARUYAMA2017-08-081-1/+1
| | | | | | 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
* Updates for 3.3.4 release.Jean-Philippe Lang2017-07-021-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16746 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16622 to r16625 (#26055).Jean-Philippe Lang2017-06-071-4/+12
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16630 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16574 (#25760).Jean-Philippe Lang2017-06-061-4/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16620 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16568 (#25634).Jean-Philippe Lang2017-05-271-1/+4
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16570 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16532.Jean-Philippe Lang2017-04-091-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16533 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16500 to r16503 (#25503).Jean-Philippe Lang2017-04-084-6/+36
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16523 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16428 from trunk to 3.3-stable (#25371)Toshi MARUYAMA2017-03-241-1/+1
| | | | | | 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
* Merged r16422 from trunk to 3.3-stable (#25371)Toshi MARUYAMA2017-03-201-0/+3
| | | | | | Git 2.9 compatibility. git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16424 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16341 (#25115).Jean-Philippe Lang2017-02-281-1/+0
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16342 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16329 from trunk to 3.3-stable (#24999)Toshi MARUYAMA2017-02-051-40/+41
| | | | | | Mercurial 4.1 compatibility. git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16330 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16227 (#24869).Jean-Philippe Lang2017-01-291-2/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16290 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16092.Jean-Philippe Lang2017-01-071-2/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16145 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r16142 (3.3.2 release).Jean-Philippe Lang2017-01-071-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16143 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15958 (#24296).Jean-Philippe Lang2016-11-261-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16005 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15950 (#24348).Jean-Philippe Lang2016-11-261-3/+4
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16001 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15898.Jean-Philippe Lang2016-10-101-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15899 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15813 (#23587).Jean-Philippe Lang2016-10-021-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15878 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15846 (#23841).Jean-Philippe Lang2016-10-021-6/+6
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15867 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15645 (#23269).Jean-Philippe Lang2016-08-201-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15746 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15609 (#23278).Jean-Philippe Lang2016-07-111-0/+4
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15637 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15607 (#23246).Jean-Philippe Lang2016-07-101-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15614 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15547 and r15561 (#23020).Jean-Philippe Lang2016-06-181-0/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15566 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15536 and r15541 (#23083).Jean-Philippe Lang2016-06-181-7/+14
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15560 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15539 and r15550 (#23067).Jean-Philippe Lang2016-06-181-1/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15557 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15501 to r15508 (#15880).Jean-Philippe Lang2016-06-122-3/+37
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15513 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged 15430, 15464 to 15469, 15475, 15476 (#285, #7839).Jean-Philippe Lang2016-06-061-14/+14
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15478 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15442 (#22898).Jean-Philippe Lang2016-06-041-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15444 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15431 to r15435 (#22924, #22925, #22926).Jean-Philippe Lang2016-06-044-2/+62
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15440 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r15429 (#22911).Jean-Philippe Lang2016-06-041-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15438 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Set version to 3.3.0.Jean-Philippe Lang2016-05-211-3/+3
|\ | | | | | | git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15423 e93f8b46-1217-0410-a6f0-8f06a7374b81