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 <robert@gitlab.com>2015-12-22 06:16:08 +0300
committerRobert Speicher <robert@gitlab.com>2015-12-22 06:16:08 +0300
commit36026fb97b4e20a0021fc36ea9915a4883b9b07b (patch)
tree66df50d2fdbcc2079e5d4d19ab7c9d063f7f5c47 /Gemfile
parent4156a37aecb83155752d84f44f800dcffb61741e (diff)
parente5e4405747ec4025d8eefb5652bda2a83c283a13 (diff)
Merge branch 'rs-bump-nokogiri' into 'master'
Explicitly require Nokogiri 1.6.7.1 due to security issue ``` Name: nokogiri Version: 1.6.7 Advisory: CVE-2015-5312 Criticality: High URL: https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s Title: Nokogiri gem contains several vulnerabilities in libxml2 Solution: upgrade to >= 1.6.7.1 ``` See merge request !2154
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 3f40dcdb063..321e7b2bc92 100644
--- a/Gemfile
+++ b/Gemfile
@@ -102,6 +102,9 @@ gem 'wikicloth', '0.8.1'
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'
+
# Diffs
gem 'diffy', '~> 3.0.3'