summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-04-14 21:13:24 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-04-14 21:13:24 +0000
commit6df3cf6b4acbfe83f7a19e40bbd1471af5d6ce95 (patch)
treead732f3108fb02f1e8f95f13cc87edaedbb728b1 /qa
parent5b62f8e3ee531f63ce3c49cae03e2a618ba51615 (diff)
downloadgitlab-ce-6df3cf6b4acbfe83f7a19e40bbd1471af5d6ce95.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
-rw-r--r--qa/Gemfile2
-rw-r--r--qa/Gemfile.lock6
2 files changed, 4 insertions, 4 deletions
diff --git a/qa/Gemfile b/qa/Gemfile
index ef66b1327eb..16d9cf9e74a 100644
--- a/qa/Gemfile
+++ b/qa/Gemfile
@@ -2,7 +2,7 @@
source 'https://rubygems.org'
-gem 'gitlab-qa', '~> 10', '>= 10.2.0', require: 'gitlab/qa'
+gem 'gitlab-qa', '~> 10', '>= 10.2.1', require: 'gitlab/qa'
gem 'activesupport', '~> 6.1.7.2' # This should stay in sync with the root's Gemfile
gem 'allure-rspec', '~> 2.20.0'
gem 'capybara', '~> 3.39.0'
diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock
index 1cd898903b8..10e3de2b999 100644
--- a/qa/Gemfile.lock
+++ b/qa/Gemfile.lock
@@ -102,7 +102,7 @@ GEM
gitlab (4.18.0)
httparty (~> 0.18)
terminal-table (>= 1.5.1)
- gitlab-qa (10.2.0)
+ gitlab-qa (10.2.1)
activesupport (~> 6.1)
gitlab (~> 4.18.0)
http (~> 5.0)
@@ -318,7 +318,7 @@ DEPENDENCIES
faraday-retry (~> 2.1)
fog-core (= 2.1.0)
fog-google (~> 1.19)
- gitlab-qa (~> 10, >= 10.2.0)
+ gitlab-qa (~> 10, >= 10.2.1)
influxdb-client (~> 2.9)
knapsack (~> 4.0)
nokogiri (~> 1.14, >= 1.14.3)
@@ -343,4 +343,4 @@ DEPENDENCIES
zeitwerk (~> 2.6, >= 2.6.7)
BUNDLED WITH
- 2.4.11
+ 2.4.12