From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Wed, 7 May 2014 08:41:58 +0000 (+0000)
Subject: Merged r13130 from trunk to 2.5-stable
X-Git-Tag: 2.5.2~32
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bd373904245a8bc89fb95fa5ce16c65a58b2cb52;p=redmine.git

Merged r13130 from trunk to 2.5-stable

Gemfile: update Rails 3.2.18

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

diff --git a/Gemfile b/Gemfile
index 0f8e538fa..bb5c5b580 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem "rails", "3.2.17"
+gem "rails", "3.2.18"
 gem "rake", "~> 10.1.1"
 gem "jquery-rails", "~> 2.0.2"
 gem "coderay", "~> 1.1.0"