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 0f8e538fac8aaa25e7fd1e829a4e3c51a07cfb6b..bb5c5b58035a9ffc7d580d3c4faf1ef7b70a6e3e 100644 (file)
--- 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"