summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2016-03-02 04:12:54 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2016-03-02 04:12:54 +0000
commit2039fd951b106ff78b1d6a5cbf3aed6e092053cd (patch)
treea4179ed11820c15defe5f809f271546308d35c67
parente53d65c6f2754c99a77e3665c3288a5763b0ec71 (diff)
downloadredmine-2039fd951b106ff78b1d6a5cbf3aed6e092053cd.tar.gz
redmine-2039fd951b106ff78b1d6a5cbf3aed6e092053cd.zip
Merged r15161 from trunk to 3.1-stable
Gemfile: update Rails to 4.2.5.2 git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15163 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 0b8de623c..01acf1236 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"