]> source.dussan.org Git - redmine.git/commitdiff
2.6-stable: use rails GitHub gem on Ruby 1.8.7
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Fri, 29 Jan 2016 04:16:09 +0000 (04:16 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Fri, 29 Jan 2016 04:16:09 +0000 (04:16 +0000)
Rails 3.2.22.1 breaks Ruby 1.8.7.

* https://github.com/rails/rails/issues/23248
* https://github.com/rails/rails/pull/23250

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@15110 e93f8b46-1217-0410-a6f0-8f06a7374b81

Gemfile

diff --git a/Gemfile b/Gemfile
index 2171d518443fec53651ecd49a3da69e1e5903d27..3306077d7069bf85e1fe09174d4bccb1193ff5e2 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,10 @@
 source 'https://rubygems.org'
 
-gem "rails", "3.2.22.1"
+if RUBY_VERSION >= "1.9.3"
+  gem "rails", "3.2.22.1"
+else
+  gem "rails", :github => "rails/rails", :branch => "3-2-stable"
+end
 gem "rack-cache", "1.2" if RUBY_VERSION < "1.9.3"
 gem "jquery-rails", "~> 3.1.4"
 gem "coderay", "~> 1.1.0"