From e7780ea069fa0d5224abc4828dd2515427d172c7 Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sat, 29 Aug 2015 09:53:49 +0000
Subject: [PATCH] Merged r14521 from trunk to 3.1-stable

Gemfile: update Rails to 4.2.4

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14524 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index db1abbb6f..bcfafb98e 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.3"
+gem "rails", "4.2.4"
 gem "jquery-rails", "~> 3.1.3"
 gem "coderay", "~> 1.1.0"
 gem "builder", ">= 3.0.4"