From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Wed, 19 Feb 2014 10:19:06 +0000 (+0000)
Subject: Merged r12906 from trunk to 2.4-stable
X-Git-Tag: 2.4.4~8
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=dc431edbc8e34e63466aee3a0250628bdfc6d8e2;p=redmine.git

Merged r12906 from trunk to 2.4-stable

update Rails to 3.2.17

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

diff --git a/Gemfile b/Gemfile
index d1213f0f0..a632eb8d6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem "rails", "3.2.16"
+gem "rails", "3.2.17"
 gem "jquery-rails", "~> 2.0.2"
 gem "coderay", "~> 1.1.0"
 gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]