Merged r14884 from trunk to 3.1-stable.

update Rails to 4.2.5.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14885 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2015-11-25 04:25:18 +00:00
parent 2e43f22543
commit 3cbb4eca93

View File

@@ -4,7 +4,7 @@ if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.5.0')
abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'."
end
gem "rails", "4.2.4"
gem "rails", "4.2.5"
gem "jquery-rails", "~> 3.1.4"
gem "coderay", "~> 1.1.0"
gem "builder", ">= 3.0.4"