summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2015-11-25 04:25:18 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2015-11-25 04:25:18 +0000
commit3cbb4eca93e35dafc2894d6e36451e23a57f7e74 (patch)
tree0deb7386a36d72e026a1c20660eebec71020a0df
parent2e43f22543a2f4ef87d3a1f8fb972476886f30c6 (diff)
downloadredmine-3cbb4eca93e35dafc2894d6e36451e23a57f7e74.tar.gz
redmine-3cbb4eca93e35dafc2894d6e36451e23a57f7e74.zip
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
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 4961d117d..8079ec343 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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"