summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2013-02-12 01:46:21 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2013-02-12 01:46:21 +0000
commita211d1be7d69f2105e43f35e6dd968d2cdb1a541 (patch)
treefd165cd04dcbaafe6d81c3971c919ad7020c1243
parent0a8e0a3bedc5333268bd6d566607f6e981d0a55f (diff)
downloadredmine-a211d1be7d69f2105e43f35e6dd968d2cdb1a541.tar.gz
redmine-a211d1be7d69f2105e43f35e6dd968d2cdb1a541.zip
Merged r11353 from trunk to 2.2-stable
upgrade Rails to 3.2.12. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11355 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index f2c9a611d..f46828660 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
source 'http://rubygems.org'
-gem 'rails', '3.2.11'
+gem 'rails', '3.2.12'
gem "jquery-rails", "~> 2.0.2"
gem "i18n", "~> 0.6.0"
gem "coderay", "~> 1.0.6"