Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-12-16 05:20:28 +01:00
Code Issues Packages Projects Releases Activity
16,353 Commits 35 Branches 222 Tags
f1e86cdc3adb4796c21e126337719344e785cb36
Commit Graph

315 Commits

Author SHA1 Message Date
Jean-Philippe Lang
d85f73a30d Upgrade to Rails 4.2.0 (#14534). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13892 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-17 17:02:55 +00:00
Toshi MARUYAMA
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
 2015-01-11 04:19:33 +00:00
Jean-Philippe Lang
aca5bfdc05 Unlock capybara gem version (#18789). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13862 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-10 10:26:09 +00:00
Jean-Philippe Lang
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
 2015-01-07 20:19:49 +00:00
Toshi MARUYAMA
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
 2015-01-04 07:31:41 +00:00
Toshi MARUYAMA
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
 2015-01-03 16:18:31 +00:00
Jean-Philippe Lang
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
 2014-12-22 13:41:15 +00:00
Toshi MARUYAMA
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
 2014-12-06 13:49:09 +00:00
Jean-Philippe Lang
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
 2014-12-02 19:59:38 +00:00
Jean-Philippe Lang
f04148695a Drop shoulda. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13676 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-30 14:31:53 +00:00
Toshi MARUYAMA
107dd20c02 Gemfile: add :x64_mingw platform missing in r13651 
git-svn-id: http://svn.redmine.org/redmine/trunk@13654 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-26 04:39:20 +00:00
Toshi MARUYAMA
fcd02af27d Gemfile: add :x64_mingw platform (aka RubyInstaller x64) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13651 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-25 09:53:42 +00:00
Toshi MARUYAMA
09e62fbc68 Gemfile: update Rails to 4.1.8 
git-svn-id: http://svn.redmine.org/redmine/trunk@13611 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-18 10:59:43 +00:00
Toshi MARUYAMA
7e8afc960a Gemfile: update Rails to 4.1.7 
git-svn-id: http://svn.redmine.org/redmine/trunk@13529 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-31 04:01:59 +00:00
Toshi MARUYAMA
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
 2014-10-25 07:09:20 +00:00
Jean-Philippe Lang
2d1866d966 Merged rails-4.1 branch (#14534). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-22 17:37:16 +00:00
Jean-Baptiste Barth
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
 2014-09-16 21:17:29 +00:00
Toshi MARUYAMA
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
 2014-09-16 02:18:48 +00:00
Toshi MARUYAMA
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
 2014-09-14 14:17:52 +00:00
Toshi MARUYAMA
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
 2014-08-28 10:23:46 +00:00
Jean-Baptiste Barth
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
 2014-08-13 09:07:34 +00:00
Jean-Philippe Lang
dd11d70eb9 Moved #link_to_version to ApplicationHelper (#17431). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13322 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-14 10:35:10 +00:00
Toshi MARUYAMA
5d07f5884f Gemfile: update Rails 3.2.19 
git-svn-id: http://svn.redmine.org/redmine/trunk@13208 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-03 22:36:38 +00:00
Toshi MARUYAMA
e85044d4d9 Gemfile: update builder version >= 3.0.4 (#17309) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13196 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-06-30 13:35:41 +00:00
Toshi MARUYAMA
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
 2014-06-12 11:43:30 +00:00
Toshi MARUYAMA
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
 2014-05-24 12:04:47 +00:00
Toshi MARUYAMA
e06de47234 Gemfile: update Rails 3.2.18 
git-svn-id: http://svn.redmine.org/redmine/trunk@13130 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-07 07:55:53 +00:00
Toshi MARUYAMA
9875ed9954 Gemfile: upgrade mocha version (#16685) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13117 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-01 11:44:06 +00:00
Toshi MARUYAMA
4276fc306c Gemfile: use double quote for request_store (#16685) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13112 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-01 01:50:40 +00:00
Toshi MARUYAMA
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
 2014-05-01 00:44:01 +00:00
Toshi MARUYAMA
e4cf210fa2 use bundled awesome_nested_set (#6579) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13008 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-26 01:47:31 +00:00
Toshi MARUYAMA
291de3d03f Gemfile: pin rake version 10.1 
rake 10.2.0 requires Ruby version >= 1.9.

git-svn-id: http://svn.redmine.org/redmine/trunk@13001 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-25 07:14:34 +00:00
Toshi MARUYAMA
4dc7bc75b4 update Rails to 3.2.17 
git-svn-id: http://svn.redmine.org/redmine/trunk@12906 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-19 09:32:51 +00:00
Toshi MARUYAMA
9e71d89cdb Gemfile: use awesome_nested_set 2.1.6 gem 
git-svn-id: http://svn.redmine.org/redmine/trunk@12734 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-01-27 06:48:38 +00:00
Jean-Philippe Lang
e1189c5335 Use the mime-types gem for getting mime types from filenames (#15790). 
git-svn-id: http://svn.redmine.org/redmine/trunk@12483 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-01-05 16:35:59 +00:00
Jean-Philippe Lang
a657a12450 Don't load redcarpet with JRuby. 
git-svn-id: http://svn.redmine.org/redmine/trunk@12453 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-23 17:07:51 +00:00
Jean-Philippe Lang
471e01ca50 Adds experimental support for Markdown formatting with redcarpet (#15520). 
git-svn-id: http://svn.redmine.org/redmine/trunk@12452 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-23 13:05:10 +00:00
Toshi MARUYAMA
8a123b178c update Rails version 3.2.16 
git-svn-id: http://svn.redmine.org/redmine/trunk@12355 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-12-04 07:04:15 +00:00
Jean-Philippe Lang
bc0ec54afa Removed database_cleaner dependency (#15377). 
git-svn-id: http://svn.redmine.org/redmine/trunk@12298 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-18 21:56:26 +00:00
Toshi MARUYAMA
b96941763d upgrade activerecord-jdbc-adapter to 1.3.2 
git-svn-id: http://svn.redmine.org/redmine/trunk@12254 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 16:44:44 +00:00
Jean-Philippe Lang
3661766edc Upgrade to Rails 3.2.15. 
git-svn-id: http://svn.redmine.org/redmine/trunk@12246 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 07:51:00 +00:00
Toshi MARUYAMA
2e1f80dcde Gemfile: remove "i18n" 
activesupport 3.2.13 requires i18n 0.6.1 explicitly.
197b9f4d61

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12243 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-29 06:24:28 +00:00
Toshi MARUYAMA
56639689e0 back out r12241 (back out Rails version 3.2.13) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12242 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-29 05:45:44 +00:00
Toshi MARUYAMA
2cc413351a Gemfile: update Rails version 3.2.15 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12241 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-29 05:18:06 +00:00
Jean-Philippe Lang
7f22cc6113 Upgrade CodeRay to 1.1.0 (#8253). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12238 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-26 08:55:50 +00:00
Toshi MARUYAMA
13f6cd6b71 revert r12175 (#14883) 
revert jdbc adapter version to above 1.2.6
due to test failure by "stack level too deep".

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12179 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-09-30 03:25:06 +00:00
Toshi MARUYAMA
5259da5e80 Gemfile: update jdbc adapter version above 1.3.0 (#14883) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12175 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-09-30 02:01:25 +00:00
Toshi MARUYAMA
3bc1dd573a Gemfile: update ruby-openid version above 2.3.0 (#14919) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12173 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-09-30 00:18:26 +00:00
Toshi MARUYAMA
c136e6bc60 Gemfile: update jdbc adapter version above 1.2.6 (#14883) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12172 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-09-29 23:52:00 +00:00
Toshi MARUYAMA
a43eb91f45 update ruby-openid version to 2.2.3 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12033 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-07-19 15:21:14 +00:00