summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-16 21:07:25 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-16 21:07:25 +0000
commit32cfd14a94117d1e56524727e7d1b649493f5790 (patch)
tree9de87db328f7a1e83e0e195a5e16aad78cd2b24e /qa
parentb6b701cf9d08253d7c6f1e7500a09b1e373e18e3 (diff)
downloadgitlab-ce-32cfd14a94117d1e56524727e7d1b649493f5790.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 e8d3a435766..bf9def83a01 100644
--- a/qa/Gemfile
+++ b/qa/Gemfile
@@ -2,7 +2,7 @@
source 'https://rubygems.org'
-gem 'gitlab-qa', '~> 10', '>= 10.3.0', require: 'gitlab/qa'
+gem 'gitlab-qa', '~> 10', '>= 10.4.0', require: 'gitlab/qa'
gem 'gitlab_quality-test_tooling', '~> 0.4.0', require: false
gem 'activesupport', '~> 6.1.7.2' # This should stay in sync with the root's Gemfile
gem 'allure-rspec', '~> 2.20.0'
diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock
index 9b2b8acfb87..bbc06686b10 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.3.0)
+ gitlab-qa (10.4.0)
activesupport (~> 6.1)
gitlab (~> 4.18.0)
http (~> 5.0)
@@ -327,7 +327,7 @@ DEPENDENCIES
faraday-retry (~> 2.1)
fog-core (= 2.1.0)
fog-google (~> 1.19)
- gitlab-qa (~> 10, >= 10.3.0)
+ gitlab-qa (~> 10, >= 10.4.0)
gitlab_quality-test_tooling (~> 0.4.0)
influxdb-client (~> 2.9)
knapsack (~> 4.0)