summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2013-10-29 06:31:48 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2013-10-29 06:31:48 +0000
commite774b8a6009d280b512bb75a25cbf64724cb947a (patch)
tree284fdf90c0186b8562b5e07a2801cd7d2a2c1321
parent5ce399b0fbc283667546dd0efb454b72d0d87865 (diff)
downloadredmine-e774b8a6009d280b512bb75a25cbf64724cb947a.tar.gz
redmine-e774b8a6009d280b512bb75a25cbf64724cb947a.zip
Merged r12243 from trunk to 2.3-stable
Gemfile: remove "i18n". activesupport 3.2.13 requires i18n 0.6.1 explicitly. https://github.com/rails/rails/commit/197b9f4d61260bea9e2a0a4883977e02164a0667 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12244 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--Gemfile1
1 files changed, 0 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index abb574c18..6de2eab11 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,6 @@ source 'https://rubygems.org'
gem "rails", "3.2.13"
gem "jquery-rails", "~> 2.0.2"
-gem "i18n", "~> 0.6.0"
gem "coderay", "~> 1.0.9"
gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
gem "builder", "3.0.0"