summaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2016-03-02 04:10:08 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2016-03-02 04:10:08 +0000
commit7788ed251f57832e483fe4197b61d9a0ac08ac73 (patch)
treea9bbacc5f041f804cf3a26c1e3199d09c91ac47f /Gemfile
parent0b0a7a92d9895086e6b9788e34c138d0bd462474 (diff)
downloadredmine-7788ed251f57832e483fe4197b61d9a0ac08ac73.tar.gz
redmine-7788ed251f57832e483fe4197b61d9a0ac08ac73.zip
Merged r15161 from trunk to 3.2-stable
Gemfile: update Rails to 4.2.5.2 git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15162 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 7a671177a..7092e2ca2 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.1"
+gem "rails", "4.2.5.2"
gem "jquery-rails", "~> 3.1.4"
gem "coderay", "~> 1.1.0"
gem "builder", ">= 3.0.4"