9acb58133b
Merged r14813 from trunk to 3.0-stable (#20591, #20811)
update rbpdf version to 1.18.7.
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14815 e93f8b46-1217-0410-a6f0-8f06a7374b81
8 years ago
8a338756fd
Merged r14654 (#20380).
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14656 e93f8b46-1217-0410-a6f0-8f06a7374b81
8 years ago
6e89444e43
3.0-stable: revert r14571 (back to Rails 4.2.3)
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14574 e93f8b46-1217-0410-a6f0-8f06a7374b81
8 years ago
18d4c6fdec
Merged r14521 from trunk to 3.0-stable
Gemfile: update Rails to 4.2.4
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14571 e93f8b46-1217-0410-a6f0-8f06a7374b81
8 years ago
1756ca3909
Merged r14480 (#20735).
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14566 e93f8b46-1217-0410-a6f0-8f06a7374b81
8 years ago
0aa7803018
Merged r14370 from trunk to 3.0-stable.
Gemfile: update Rails to 4.2.3.
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14371 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
cf0bc934a3
Merged r14360 from trunk to 3.0-stable (#20142)
update Gemfile to require rbpdf ~>1.18.6.
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14361 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
1ea8b3608e
Merged r14329 from trunk to 3.0-stable (#19252)
Gemfile: use jdbc-sqlite3 version >= 3.8.10.1.
sqlite-jdbc was updated to 3.8.10.1 in upstream.
f7a20b0d57http://svn.redmine.org/redmine/branches/3.0-stable@14330 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
afc644cd17
Merged r14319 and r14323 from trunk to 3.0-stable
* Gemfile: update Rails to 4.2.2
* Gemfile: explicitly update jquery-rails version to 3.1.3 (CVE-2015-1840)
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14324 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
524bd1479b
Merged r14175 from trunk to 3.0-stable (#19252)
Gemfile: remove activerecord-jdbcsqlite3-adapter version and pin jdbc-sqlite3 version < 3.8.
r13829 comment "test/functional/issues_controller_test.rb failure" is due to sqlite3 3.8.
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14176 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
40e599f31b
Merged r14167 from trunk to 3.0-stable
Gemfile: pin rmagick version 2.13
rmagick 2.14 prints
'[DEPRECATION] requiring "RMagick" is deprecated. Use "rmagick" instead'.
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14168 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
484ea96b9c
Merged r14135 from trunk to 3.0-stable.
Gemfile: upgrade Rails version to 4.2.1
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14144 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
fee5faa9b8
Merged r14118 from trunk to 3.0-stable
Gemfile: remove "ffi"
ffi 1.9.7 building error is fixed.
https://github.com/ffi/ffi/issues/414#issuecomment-81405252
r14118 comment has typo, problem version is not 1.9.6, it is 1.9.7.
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14126 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
269b5045ca
Merged r14097 from trunk to 3.0-stable
Gemfile: move "ffi" definition to :test group
Depending:
selenium-webdriver -> childprocess -> ffi
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14098 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
8a26ce6a75
Merged r14078.
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14096 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
795bbbec2f
Merged r14065 (#19172).
git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14066 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
b3fdc1ca8b
Gemfile: remove mocha version
git-svn-id: http://svn.redmine.org/redmine/trunk@13947 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
3a7847c785
Require rbpdf 1.18.5 that is Rails 4.2 compatible (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13943 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
5190fef9d6
Fix migration and use Rails 4.2.0 release (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13894 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
73762a7d62
Gemfile: use GitHub rails gem
2009111410http://svn.redmine.org/redmine/trunk@13893 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
d85f73a30d
Upgrade to Rails 4.2.0 (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13892 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
34b3376b81
Gemfile: update rbpdf version to 1.18.4 (#18629)
git-svn-id: http://svn.redmine.org/redmine/trunk@13870 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
aca5bfdc05
Unlock capybara gem version (#18789).
git-svn-id: http://svn.redmine.org/redmine/trunk@13862 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
1a851318fd
Replaces awesome_nested_set gem with a simple and more robust implementation of nested sets.
The concurrency tests added in this commit trigger dead locks and/or nested set inconsistency with awesome_nested_set.
git-svn-id: http://svn.redmine.org/redmine/trunk@13841 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
bf5d58a768
Gemfile: pin pg version 0.17
On Rails 4.1.8, pg 0.18.0 cause error.
<pre>
1) Failure:
WikiContentTest#test_update_with_gzipped_history [test/unit/wiki_content_test.rb:88]:
Expected: "gzip"
Actual: ""
</pre>
git-svn-id: http://svn.redmine.org/redmine/trunk@13839 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
9da6bb31c1
Gemfile: pin activerecord-jdbcsqlite3-adapter version 1.3.11
1.3.13 breaks test/functional/issues_controller_test.rb.
git-svn-id: http://svn.redmine.org/redmine/trunk@13829 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
6c6ea394af
XML parameters parser extracted to actionpack-xml_parser gem in Rails 4 (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13790 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
8caeb9f242
Gemfile: update rbpdf version to 1.18.3 (#16040, #18586, #10681)
git-svn-id: http://svn.redmine.org/redmine/trunk@13726 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
c3ba302f0d
Use simplecov for code coverage, rcov does not support ruby>=1.9.
git-svn-id: http://svn.redmine.org/redmine/trunk@13691 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
f04148695a
Drop shoulda.
git-svn-id: http://svn.redmine.org/redmine/trunk@13676 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
107dd20c02
Gemfile: add :x64_mingw platform missing in r13651
git-svn-id: http://svn.redmine.org/redmine/trunk@13654 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
fcd02af27d
Gemfile: add :x64_mingw platform (aka RubyInstaller x64)
git-svn-id: http://svn.redmine.org/redmine/trunk@13651 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
09e62fbc68
Gemfile: update Rails to 4.1.8
git-svn-id: http://svn.redmine.org/redmine/trunk@13611 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
7e8afc960a
Gemfile: update Rails to 4.1.7
git-svn-id: http://svn.redmine.org/redmine/trunk@13529 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
caccb57b55
Gemfile: update rbpdf to version 1.18.2 (#18176)
git-svn-id: http://svn.redmine.org/redmine/trunk@13506 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
2d1866d966
Merged rails-4.1 branch (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
e632a79d59
Add a constraint on "shoulda-matchers" version (#17828).
This helps bundler find its dependencies in case shoulda-matchers v1.4.2 is
already installed. In such a case bundler breaks while it shouldn't.
git-svn-id: http://svn.redmine.org/redmine/trunk@13411 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
a614678835
Gemfile: update rbpdf version to 1.18.1 (#17570)
git-svn-id: http://svn.redmine.org/redmine/trunk@13409 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
cc688bb1b1
Backport r13313 from rails-4.1 to trunk.
Upgrade to JQuery 1.11.1
git-svn-id: http://svn.redmine.org/redmine/trunk@13408 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
4a9210d86f
use rbpdf gem instead of bundled rfpdf (#17570)
Contributed by Jun NAITOH.
git-svn-id: http://svn.redmine.org/redmine/trunk@13358 e93f8b46-1217-0410-a6f0-8f06a7374b81
9 years ago
81f165966e
Add ability to define plugins' gem dependencies in PluginGemfile (#14030).
git-svn-id: http://svn.redmine.org/redmine/trunk@13337 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
dd11d70eb9
Moved #link_to_version to ApplicationHelper (#17431).
git-svn-id: http://svn.redmine.org/redmine/trunk@13322 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
5d07f5884f
Gemfile: update Rails 3.2.19
git-svn-id: http://svn.redmine.org/redmine/trunk@13208 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
e85044d4d9
Gemfile: update builder version >= 3.0.4 (#17309)
git-svn-id: http://svn.redmine.org/redmine/trunk@13196 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
8ee6495978
Gemfile: pin request_store version 1.0.5 (#16685)
Many integration tests are broken.
git-svn-id: http://svn.redmine.org/redmine/trunk@13181 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
1a74bf6485
Gemfile: upgrade sqlserver tiny_tds to 0.6.2 (#6579)
git-svn-id: http://svn.redmine.org/redmine/trunk@13152 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
e06de47234
Gemfile: update Rails 3.2.18
git-svn-id: http://svn.redmine.org/redmine/trunk@13130 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
9875ed9954
Gemfile: upgrade mocha version (#16685)
git-svn-id: http://svn.redmine.org/redmine/trunk@13117 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
4276fc306c
Gemfile: use double quote for request_store (#16685)
git-svn-id: http://svn.redmine.org/redmine/trunk@13112 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
a599442d05
introduce request_store to ensure that the current user doesn't leak across request boundaries (#16685)
Contributed by Holger Just.
git-svn-id: http://svn.redmine.org/redmine/trunk@13110 e93f8b46-1217-0410-a6f0-8f06a7374b81
10 years ago
Toshi MARUYAMA
Jean-Philippe Lang
Jean-Baptiste Barth