summaryrefslogtreecommitdiffstats
path: root/Gemfile
Commit message (Collapse)AuthorAgeFilesLines
* Merged r13208 from trunk to 2.4-stableToshi MARUYAMA2014-07-041-1/+1
| | | | | | Gemfile: update Rails 3.2.19 git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13211 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13130 from trunk to 2.4-stableToshi MARUYAMA2014-05-071-1/+1
| | | | | | Gemfile: update Rails 3.2.18 git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13134 e93f8b46-1217-0410-a6f0-8f06a7374b81
* 2.4-stable: revert r13114 (#16685)Toshi MARUYAMA2014-05-011-1/+0
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13121 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13117 from trunk to 2.4-stable (#16685)Toshi MARUYAMA2014-05-011-1/+1
| | | | | | Gemfile: upgrade mocha version. git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13119 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13110 and r13112 from trunk to 2.4-stable (#16685)Toshi MARUYAMA2014-05-011-0/+1
| | | | | | | | introduce request_store to ensure that the current user doesn't leak across request boundaries. Contributed by Holger Just. git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13114 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13001 from trunk to 2.4-stable.Toshi MARUYAMA2014-03-251-0/+1
| | | | | | | | Gemfile: pin rake version 10.1. rake 10.2.0 requires Ruby version >= 1.9. git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13003 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12906 from trunk to 2.4-stableToshi MARUYAMA2014-02-191-1/+1
| | | | | | update Rails to 3.2.17 git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12908 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r12355 from trunk to 2.4-stable.Toshi MARUYAMA2013-12-041-1/+1
| | | | | | update Rails version 3.2.16. git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@12357 e93f8b46-1217-0410-a6f0-8f06a7374b81
* upgrade activerecord-jdbc-adapter to 1.3.2Toshi MARUYAMA2013-11-091-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@12254 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Upgrade to Rails 3.2.15.Jean-Philippe Lang2013-11-091-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@12246 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Gemfile: remove "i18n"Toshi MARUYAMA2013-10-291-1/+0
| | | | | | | activesupport 3.2.13 requires i18n 0.6.1 explicitly. https://github.com/rails/rails/commit/197b9f4d61260bea9e2a0a4883977e02164a0667 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12243 e93f8b46-1217-0410-a6f0-8f06a7374b81
* back out r12241 (back out Rails version 3.2.13)Toshi MARUYAMA2013-10-291-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12242 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Gemfile: update Rails version 3.2.15Toshi MARUYAMA2013-10-291-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12241 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Upgrade CodeRay to 1.1.0 (#8253).Jean-Philippe Lang2013-10-261-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12238 e93f8b46-1217-0410-a6f0-8f06a7374b81
* revert r12175 (#14883)Toshi MARUYAMA2013-09-301-1/+1
| | | | | | | 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
* Gemfile: update jdbc adapter version above 1.3.0 (#14883)Toshi MARUYAMA2013-09-301-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12175 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Gemfile: update ruby-openid version above 2.3.0 (#14919)Toshi MARUYAMA2013-09-301-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12173 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Gemfile: update jdbc adapter version above 1.2.6 (#14883)Toshi MARUYAMA2013-09-291-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12172 e93f8b46-1217-0410-a6f0-8f06a7374b81
* update ruby-openid version to 2.2.3Toshi MARUYAMA2013-07-191-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12033 e93f8b46-1217-0410-a6f0-8f06a7374b81
* use database_cleaner (#12822)Toshi MARUYAMA2013-06-141-0/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11974 e93f8b46-1217-0410-a6f0-8f06a7374b81
* prevent coderay "warning: already initialized constant" on Ruby 1.8.7 (#13692)Toshi MARUYAMA2013-06-041-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11925 e93f8b46-1217-0410-a6f0-8f06a7374b81
* upgrade mocha 0.14 and remove deprecation warningToshi MARUYAMA2013-05-211-1/+1
| | | | | | | | <pre> Mocha deprecation warning: Change `require 'mocha'` to `require 'mocha/setup'`. </pre> git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11896 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Improve plugins' Gemfile loading (#14028).Jean-Baptiste Barth2013-05-111-1/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11826 e93f8b46-1217-0410-a6f0-8f06a7374b81
* install capybara on only Ruby 1.9.3 or higher (#12822)Toshi MARUYAMA2013-05-091-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11806 e93f8b46-1217-0410-a6f0-8f06a7374b81
* upgrade capybara to 2.1 (#12822)Toshi MARUYAMA2013-05-091-1/+4
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11805 e93f8b46-1217-0410-a6f0-8f06a7374b81
* upgrade Rails 3.2.13Toshi MARUYAMA2013-03-191-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11649 e93f8b46-1217-0410-a6f0-8f06a7374b81
* upgrade mocha ~> 0.13.3Toshi MARUYAMA2013-03-191-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11648 e93f8b46-1217-0410-a6f0-8f06a7374b81
* backout r11644.Toshi MARUYAMA2013-03-191-1/+1
| | | | | | revert Rails version to 3.2.12. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11647 e93f8b46-1217-0410-a6f0-8f06a7374b81
* upgrade Rails 3.2.13Toshi MARUYAMA2013-03-191-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11644 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Distinguish mysql/mysql2 adapters in Gemfile (#13270).Jean-Philippe Lang2013-02-281-4/+5
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11494 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Ruby2.0: switch mysql2 platforms by RUBY_VERSIONToshi MARUYAMA2013-02-261-1/+2
| | | | | | It seems old bundler does not support :mri_20 and :mingw_20 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11490 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Ruby2.0: add platforms to Gemfile mysql2Toshi MARUYAMA2013-02-261-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11489 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Ruby2.0: add "require 'yaml'" to GemfileToshi MARUYAMA2013-02-261-0/+1
| | | | | | | | | | On ruby 2.0.0p0 (2013-02-24 revision 39474) [x86_64-linux]: <pre> $ ruby script/about There was an error in your Gemfile, and Bundler cannot continue. </pre> git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11488 e93f8b46-1217-0410-a6f0-8f06a7374b81
* back out r11486Toshi MARUYAMA2013-02-261-2/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11487 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Require 'yaml'.Jean-Philippe Lang2013-02-251-1/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11486 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Use https://rubygems.org as gem source (#13173).Jean-Philippe Lang2013-02-241-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11464 e93f8b46-1217-0410-a6f0-8f06a7374b81
* upgrade Rails to 3.2.12Toshi MARUYAMA2013-02-121-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11353 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Gemfile: unpin mocha versionToshi MARUYAMA2013-02-041-1/+1
| | | | | | This is pinned by r10155 and r10167 due to CI server failure. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11327 e93f8b46-1217-0410-a6f0-8f06a7374b81
* remove "test-unit" from GemfileToshi MARUYAMA2013-02-041-5/+0
| | | | | | This is added by r10137 (#10320, #10818) and shoulda version was upgraded by r11324. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11325 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Upgrade shoulda.Jean-Philippe Lang2013-02-031-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11324 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Parse database.yml with erb (#13004).Jean-Philippe Lang2013-01-291-1/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11286 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Adds first Capybara tests (#12822).Jean-Philippe Lang2013-01-261-0/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11270 e93f8b46-1217-0410-a6f0-8f06a7374b81
* More specific warning.Jean-Philippe Lang2013-01-211-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11252 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Don't abort when database.yml is not present.Jean-Philippe Lang2013-01-191-2/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11202 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Bundle only the required database gems and adds sqlserver support (#12713).Jean-Philippe Lang2013-01-151-33/+31
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11194 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Upgrade to Rails 3.2.11Toshi MARUYAMA2013-01-081-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11140 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Use activerecord-jdbc-adapter 1.2.5.Jean-Philippe Lang2013-01-041-2/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11114 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Upgrade to Rails 3.2.10.Jean-Philippe Lang2013-01-031-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11109 e93f8b46-1217-0410-a6f0-8f06a7374b81
* cannot load Java class com.mysql.jdbc.Driver error with jdbc-mysql 5.1.22.Jean-Philippe Lang2013-01-021-0/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11089 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Tests broken with activerecord-jdbc-adapter 1.2.3.Jean-Philippe Lang2012-12-261-0/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11085 e93f8b46-1217-0410-a6f0-8f06a7374b81