From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Tue, 26 Jan 2016 11:45:29 +0000 (+0000)
Subject: Merged r15103 from trunk to 3.2-stable.
X-Git-Tag: 3.2.1~34
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=604b3472d418ecee5299285318fafb79d19a7fa4;p=redmine.git

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

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"