summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2014-05-07 08:41:58 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2014-05-07 08:41:58 +0000
commitbd373904245a8bc89fb95fa5ce16c65a58b2cb52 (patch)
treec5853ad7f3240fd60ba8da33528fa9ef5fcdd66b
parent983ec24a97d4f7243d347da7b7fdfcf961153130 (diff)
downloadredmine-bd373904245a8bc89fb95fa5ce16c65a58b2cb52.tar.gz
redmine-bd373904245a8bc89fb95fa5ce16c65a58b2cb52.zip
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
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
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"