Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-01-26 00:34:13 +0300
committerRobert Speicher <rspeicher@gmail.com>2016-01-26 00:34:13 +0300
commit484d14680db012509a8d35092aebd5be714cf943 (patch)
tree55fc1f190e822a65db61b238c210cc4c5f889e89 /Gemfile
parent8b3285bfdffc3ee6a2fbd65a8d7981214344deda (diff)
Update rails, rails-html-sanitizer, and nokogiri for security fixes
See https://dev.gitlab.org/gitlab/gitlabhq/issues/2643
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 1d367441364..37aeb09e93c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
source "https://rubygems.org"
-gem 'rails', '4.2.5'
+gem 'rails', '4.2.5.1'
gem 'rails-deprecated_sanitizer', '~> 1.0.3'
# Responders respond_to and respond_with
@@ -103,7 +103,8 @@ gem 'asciidoctor', '~> 1.5.2'
gem 'rouge', '~> 1.10.1'
# See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
-gem 'nokogiri', '1.6.7.1'
+# and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
+gem 'nokogiri', '1.6.7.2'
# Diffs
gem 'diffy', '~> 3.0.3'