summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-04-22 13:59:15 -0700
committerStan Hu <stanhu@gmail.com>2019-04-22 13:59:15 -0700
commit9d7bb9d8c2631a9bd781fa7793fbcfc4fdbf71b8 (patch)
tree86ed017a746e351a1a1bb22742b149468ae43f80 /qa
parent84a1e37f4a889c6b7558f101dc0ecf2932d0a0c6 (diff)
downloadgitlab-ce-9d7bb9d8c2631a9bd781fa7793fbcfc4fdbf71b8.tar.gz
Bump Nokogiri to 1.10.3sh-bump-nokogiri-1.10.3
This pulls in a fix for libxslt that addresses CVE-2019-11068: https://github.com/sparklemotion/nokogiri/releases
Diffstat (limited to 'qa')
-rw-r--r--qa/Gemfile2
-rw-r--r--qa/Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/qa/Gemfile b/qa/Gemfile
index 38e95ba2d65..64215b24cf1 100644
--- a/qa/Gemfile
+++ b/qa/Gemfile
@@ -7,6 +7,6 @@ gem 'rake', '~> 12.3.0'
gem 'rspec', '~> 3.7'
gem 'selenium-webdriver', '~> 3.12'
gem 'airborne', '~> 0.2.13'
-gem 'nokogiri', '~> 1.10.1'
+gem 'nokogiri', '~> 1.10.3'
gem 'rspec-retry', '~> 0.6.1'
gem 'faker', '~> 1.6', '>= 1.6.6'
diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock
index 9d3d42fb6ae..a06c88b6f0a 100644
--- a/qa/Gemfile.lock
+++ b/qa/Gemfile.lock
@@ -49,7 +49,7 @@ GEM
mini_portile2 (2.4.0)
minitest (5.11.1)
netrc (0.11.0)
- nokogiri (1.10.2)
+ nokogiri (1.10.3)
mini_portile2 (~> 2.4.0)
pry (0.11.3)
coderay (~> 1.1.0)
@@ -102,7 +102,7 @@ DEPENDENCIES
capybara (~> 2.16.1)
capybara-screenshot (~> 1.0.18)
faker (~> 1.6, >= 1.6.6)
- nokogiri (~> 1.10.1)
+ nokogiri (~> 1.10.3)
pry-byebug (~> 3.5.1)
rake (~> 12.3.0)
rspec (~> 3.7)