Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-07-06 03:07:43 +02:00
Code Issues Packages Projects Releases Activity

Merged r14319 and r14323 from trunk to 3.0-stable

Browse Source 
* 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
This commit is contained in:
Toshi MARUYAMA
2015-06-17 13:54:29 +00:00
parent 1ced42dd57
commit afc644cd17
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@@ -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"