summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2015-06-17 13:59:02 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2015-06-17 13:59:02 +0000
commit6f01582c61bb85fdf41aa49dca285bcaeb3ad8bd (patch)
tree58c3640862b20737f3c17f1ae9623d7e3aaf8e10
parentc6f0a04eefee3c7f693f7f45d1d8d1869ec4e553 (diff)
downloadredmine-6f01582c61bb85fdf41aa49dca285bcaeb3ad8bd.tar.gz
redmine-6f01582c61bb85fdf41aa49dca285bcaeb3ad8bd.zip
Merged r14323 from trunk to 2.6-stable.
Gemfile: explicitly update jquery-rails version to 3.1.3 (CVE-2015-1840) git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14325 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index ed72c2628..fa9442e96 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
gem "rails", "3.2.22"
-gem "jquery-rails", "~> 3.1.1"
+gem "jquery-rails", "~> 3.1.3"
gem "coderay", "~> 1.1.0"
gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
gem "builder", ">= 3.0.4"