summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2014-05-07 08:43:55 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2014-05-07 08:43:55 +0000
commitea26a253ea8ea29e8bfedd493549edb17ee1a734 (patch)
tree95f75527f68a9fc41dab050ed05e4a265bbe3229
parent87cb2fdfd19eae31804063af57b538610c8b774f (diff)
downloadredmine-ea26a253ea8ea29e8bfedd493549edb17ee1a734.tar.gz
redmine-ea26a253ea8ea29e8bfedd493549edb17ee1a734.zip
Merged r13130 from trunk to 2.4-stable
Gemfile: update Rails 3.2.18 git-svn-id: http://svn.redmine.org/redmine/branches/2.4-stable@13134 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index bdc39b3cb..4d43a7e75 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"