From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Fri, 20 Mar 2015 10:42:43 +0000 (+0000)
Subject: Merged r14135 from trunk to 3.0-stable.
X-Git-Tag: 3.0.2~29
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=484ea96b9c265b2accaea8be11368b80a215d4b7;p=redmine.git

Merged r14135 from trunk to 3.0-stable.

Gemfile: upgrade Rails version to 4.2.1

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14144 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/Gemfile b/Gemfile
index 96725a370..f9132281f 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.0"
+gem "rails", "4.2.1"
 gem "jquery-rails", "~> 3.1.1"
 gem "coderay", "~> 1.1.0"
 gem "builder", ">= 3.0.4"