summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-02-14 06:10:32 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-02-14 06:10:32 +0000
commitb02c014a8fd04fd3675d74d22ce855388ec66daa (patch)
tree301874cc84fe211a72c1ddd2d8a8331293646ca2 /qa
parent6be10e8588cd18091d8302fd52e166a71900f7bc (diff)
downloadgitlab-ce-b02c014a8fd04fd3675d74d22ce855388ec66daa.tar.gz
Add latest changes from gitlab-org/gitlab@master
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 b04653a657c..9e41b5ddeed 100644
--- a/qa/Gemfile
+++ b/qa/Gemfile
@@ -38,7 +38,7 @@ gem 'chemlab', '~> 0.10'
gem 'chemlab-library-www-gitlab-com', '~> 0.1', '>= 0.1.1'
# dependencies for jenkins client
-gem 'nokogiri', '~> 1.14', '>= 1.14.1'
+gem 'nokogiri', '~> 1.14', '>= 1.14.2'
gem 'deprecation_toolkit', '~> 2.0.3', require: false
diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock
index 9feb930d7c9..d544aa685a5 100644
--- a/qa/Gemfile.lock
+++ b/qa/Gemfile.lock
@@ -180,7 +180,7 @@ GEM
multi_json (1.15.0)
multi_xml (0.6.0)
netrc (0.11.0)
- nokogiri (1.14.1)
+ nokogiri (1.14.2)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
octokit (6.0.1)
@@ -320,7 +320,7 @@ DEPENDENCIES
gitlab-qa (~> 9)
influxdb-client (~> 2.9)
knapsack (~> 4.0)
- nokogiri (~> 1.14, >= 1.14.1)
+ nokogiri (~> 1.14, >= 1.14.2)
octokit (~> 6.0.1)
parallel (~> 1.22, >= 1.22.1)
parallel_tests (~> 4.2)