From afc644cd1707b102e97a094d6749629268560a3d Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Wed, 17 Jun 2015 13:54:29 +0000 Subject: [PATCH] Merged r14319 and r14323 from trunk to 3.0-stable * Gemfile: update Rails to 4.2.2 * Gemfile: explicitly update jquery-rails version to 3.1.3 (CVE-2015-1840) git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14324 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index ce04f213e..60988302f 100644 --- a/Gemfile +++ b/Gemfile @@ -4,8 +4,8 @@ if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.5.0') abort "Redmine requires Bundler 1.5.0 or higher (you're using #{Bundler::VERSION}).\nPlease update with 'gem update bundler'." end -gem "rails", "4.2.1" -gem "jquery-rails", "~> 3.1.1" +gem "rails", "4.2.2" +gem "jquery-rails", "~> 3.1.3" gem "coderay", "~> 1.1.0" gem "builder", ">= 3.0.4" gem "request_store", "1.0.5" -- 2.39.5