summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2016-01-26 11:45:29 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2016-01-26 11:45:29 +0000
commit604b3472d418ecee5299285318fafb79d19a7fa4 (patch)
tree229b9205febfd8dabe9200d4c27053aa7863ea47
parent274378ceb25e8a955fd1478d663f513fbe0294a7 (diff)
downloadredmine-604b3472d418ecee5299285318fafb79d19a7fa4.tar.gz
redmine-604b3472d418ecee5299285318fafb79d19a7fa4.zip
Merged r15103 from trunk to 3.2-stable.
update Rails to 4.2.5.1. git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15106 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 4c2daee48..eb63040bd 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.5"
+gem "rails", "4.2.5.1"
gem "jquery-rails", "~> 3.1.4"
gem "coderay", "~> 1.1.0"
gem "builder", ">= 3.0.4"