summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2016-01-26 11:47:48 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2016-01-26 11:47:48 +0000
commit68d75af0ae53d1b2ccd9a073816c5c83e3b7c790 (patch)
tree4b0c51102644b929561d7756c97e70035efc190f
parent7030afc091c19c772c364fb9da71a0def028a6ee (diff)
downloadredmine-68d75af0ae53d1b2ccd9a073816c5c83e3b7c790.tar.gz
redmine-68d75af0ae53d1b2ccd9a073816c5c83e3b7c790.zip
Merged r15103 from trunk to 3.1-stable.
update Rails to 4.2.5.1. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15108 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index f5165f9d4..a096e25fc 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"