summaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2014-09-14 14:17:52 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2014-09-14 14:17:52 +0000
commitcc688bb1b1142761e843c30f1f537b693b29542b (patch)
tree9fa043d46e2f9016c48db0d7773d0727d684fa31 /Gemfile
parent0b8645007fdf26aff728bdee208ddd1b233e62b8 (diff)
downloadredmine-cc688bb1b1142761e843c30f1f537b693b29542b.tar.gz
redmine-cc688bb1b1142761e843c30f1f537b693b29542b.zip
Backport r13313 from rails-4.1 to trunk.
Upgrade to JQuery 1.11.1 git-svn-id: http://svn.redmine.org/redmine/trunk@13408 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 891719ffc..f504c92d5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
gem "rails", "3.2.19"
-gem "jquery-rails", "~> 2.0.2"
+gem "jquery-rails", "~> 3.1.1"
gem "coderay", "~> 1.1.0"
gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
gem "builder", ">= 3.0.4"