From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Wed, 2 Mar 2016 04:12:54 +0000 (+0000)
Subject: Merged r15161 from trunk to 3.1-stable
X-Git-Tag: 3.1.4~9
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2039fd951b106ff78b1d6a5cbf3aed6e092053cd;p=redmine.git

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
---

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"