Jean-Philippe Lang
1198d3003e
Updates for 3.2.9 release.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@17165 e93f8b46-1217-0410-a6f0-8f06a7374b81
6 years ago
Toshi MARUYAMA
c54068f2dc
Merged r17116 from trunk to 3.2-stable (#27691)
Gemfile: relax mail gem version.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@17119 e93f8b46-1217-0410-a6f0-8f06a7374b81
6 years ago
Toshi MARUYAMA
02a2ca8c04
Merged r17062 from trunk to 3.2-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.2-stable@17076 e93f8b46-1217-0410-a6f0-8f06a7374b81
6 years ago
Toshi MARUYAMA
4fb2d864af
Merged r17061 from trunk to 3.2-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.2-stable@17075 e93f8b46-1217-0410-a6f0-8f06a7374b81
6 years ago
Toshi MARUYAMA
3481b49a1a
Merged r17060 from trunk to 3.2-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.2-stable@17074 e93f8b46-1217-0410-a6f0-8f06a7374b81
6 years ago
Toshi MARUYAMA
d9d803abb5
Merged r16421 from trunk to 3.2-stable.
set "warning = false" for "rake test:scm:units" and "rake test:scm:functionals"
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@17073 e93f8b46-1217-0410-a6f0-8f06a7374b81
6 years ago
Toshi MARUYAMA
04da8a37fe
Merged r17019 from trunk to 3.2-stable
Gemfile: pin mail gem version to prevent failure of MailHandlerTest#test_add_issue_with_localized_attributes
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@17022 e93f8b46-1217-0410-a6f0-8f06a7374b81
6 years ago
Toshi MARUYAMA
46add754c0
3.2-stable: Gemfile: pin public_suffix if ruby < 2.0 (#27229)
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@17016 e93f8b46-1217-0410-a6f0-8f06a7374b81
6 years ago
Toshi MARUYAMA
66ba88ed3d
3.2-stable: Gemfile: pin public_suffix if ruby < 2.1
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@17013 e93f8b46-1217-0410-a6f0-8f06a7374b81
6 years ago
Jean-Philippe Lang
404a549170
Updates for 3.2.8 release.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@17007 e93f8b46-1217-0410-a6f0-8f06a7374b81
6 years ago
Jean-Philippe Lang
33e4054864
Merged r16983 to r16985 (#27186).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16988 e93f8b46-1217-0410-a6f0-8f06a7374b81
6 years ago
Jean-Philippe Lang
80ca181239
Merged r16971 (#27186).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16974 e93f8b46-1217-0410-a6f0-8f06a7374b81
6 years ago
Jean-Philippe Lang
bc21fbb8b7
Updates for 3.2.7 release.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16745 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Jean-Philippe Lang
4bad238afd
Fix changelog markup (#25616).
Patch by Mischa The Evil.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16743 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Toshi MARUYAMA
3bde3c8bc3
Merged r16708 from trunk to 3.2-stable (#26261, #26263)
Simplified Chinese translation for 3.2-stable updated by Steven Wong.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16717 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Jean-Philippe Lang
a1b400242a
Merged r16676 (#26183).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16684 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Jean-Philippe Lang
9102a78bae
Merged r16626 (#25212).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16633 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Jean-Philippe Lang
93d78771c6
Merged r16622 to r16625 (#26055).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16631 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Jean-Philippe Lang
e9a7d1be63
Merged r16619 (#26072).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16629 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Jean-Philippe Lang
3bb7524c1f
Merged r16574 (#25760).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16621 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Jean-Philippe Lang
ba4744d4c4
Merged r16572 (#25861).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16618 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Toshi MARUYAMA
433e887170
Merged r16611 from trunk to 3.2-stable.
Gemfile: ping roadie version 3.2 to prevent decadency failure on CI server Ruby 2.1.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16614 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Jean-Philippe Lang
c2e613981a
Merged r16568 (#25634).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16571 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Jean-Philippe Lang
d54ede781b
Merged r16557 (#25713).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16567 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Jean-Philippe Lang
313706276c
Merged r16556 (#25745).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16565 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Jean-Philippe Lang
4150200fec
Merged r16554 and r16555 (#25653).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16563 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Jean-Philippe Lang
93b08e8044
Merged r16553 (#25829).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16561 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Toshi MARUYAMA
837bc019df
Merged r16546 from trunk to 3.2-stable (#25807)
Gemfile: pin roadie-rails version 1.1.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16548 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Jean-Philippe Lang
7ca976e0c9
Updates for 3.2.6 release.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16534 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Jean-Philippe Lang
559ce11996
Merged r16520 (#22335, #24271).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16531 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Jean-Philippe Lang
b64f8b4de9
Merged r16500 to r16503 (#25503).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16524 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Jean-Philippe Lang
ffd1ebda98
Merged r16504 (#25478).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16522 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Toshi MARUYAMA
0ffeec672c
Merged r16515 and r16516 from trunk to 3.2-stable
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16519 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Toshi MARUYAMA
85a3c9646d
Merged r16507 from trunk to 3.2-stable (#22335, #24271)
Gemfile: use rbpdf 1.19.0.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16513 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Jean-Philippe Lang
e92f3127e4
total_spent_hours not returned in 3.2 (#25526).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16510 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Jean-Philippe Lang
c66898259c
Merged r16492 (#25526).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16496 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Jean-Philippe Lang
9b2f70f4f1
Merged r16491 (#25526).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16494 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Toshi MARUYAMA
c260cd89bb
Merged r16485 from trunk to 3.2-stable (#22335, #24271)
Gemfile: explicitly use rbpdf 1.19.1.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16487 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Toshi MARUYAMA
39af7eb11e
Merged r16470 from trunk to 3.2-stable (#25349, #25505)
Russian translation for 3.2-stable updated by Kirill Bezrukov.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16472 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Toshi MARUYAMA
364e0201fd
Merged r16438 from trunk to 3.2-stable (#25204, #25458)
Portuguese translation for 3.2-stable updated by Rui Rebelo.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16440 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Toshi MARUYAMA
bf63602382
Merged r16433 from trunk to 3.2-stable (#25204, #25458)
Portuguese translation for 3.2-stable updated by Rui Rebelo.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16437 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Toshi MARUYAMA
7aa98f8187
Merged r16428 from trunk to 3.2-stable (#25371)
git: use '--no-renames' option in 'show' command.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16430 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Toshi MARUYAMA
e87c3a09bd
Merged r16422 from trunk to 3.2-stable (#25371)
Git 2.9 compatibility.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16425 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Toshi MARUYAMA
b8ab16b448
Merged r16329 from trunk to 3.2-stable (#24999)
Mercurial 4.1 compatibility.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16331 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Toshi MARUYAMA
e2ff2687f8
Merged r16324 from trunk to 3.2-stable.
Gemfile: pin i18n version 0.7.0.
i18n 0.8.0 causes error.
<pre>
Redmine::I18nTest#test_languages_options_should_ignore_locales_without_general_lang_name_key:
I18n::InvalidLocale: "foo" is not a valid locale
lib/redmine/i18n.rb:58:in `ll'
lib/redmine/i18n.rb:122:in `block in languages_options'
lib/redmine/i18n.rb:122:in `map'
lib/redmine/i18n.rb:122:in `languages_options'
test/unit/lib/redmine/i18n_test.rb:203:in `test_languages_options_should_ignore_locales_without_general_lang_name_key'
</pre>
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16326 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Jean-Philippe Lang
1efe3eb3a1
Backported r16293 (#24875).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16309 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Jean-Philippe Lang
0f9966aadf
Merged r16292 (#20661).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16308 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Jean-Philippe Lang
b67a46302f
Test failure introduced in r16295 (#24199).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16305 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Jean-Philippe Lang
0807506e18
Merged r16284 (#23803).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16303 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago
Jean-Philippe Lang
a5d45534b8
Merged r16283 (#23793).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16301 e93f8b46-1217-0410-a6f0-8f06a7374b81
7 years ago