summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-15 09:08:57 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-15 09:08:57 +0000
commit45a8c43afe8a17de19a92708b380b29b6ae04ce6 (patch)
tree4104e6ac741fbbdeefe9b8b699650a06c14e9056 /qa
parent6bc327a3491069240bd73cc83e17b3078c4148b0 (diff)
downloadgitlab-ce-45a8c43afe8a17de19a92708b380b29b6ae04ce6.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
-rw-r--r--qa/Gemfile6
-rw-r--r--qa/Gemfile.lock14
2 files changed, 10 insertions, 10 deletions
diff --git a/qa/Gemfile b/qa/Gemfile
index a7e42e32be5..e8d3a435766 100644
--- a/qa/Gemfile
+++ b/qa/Gemfile
@@ -6,7 +6,7 @@ gem 'gitlab-qa', '~> 10', '>= 10.3.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'
-gem 'capybara', '~> 3.39.0'
+gem 'capybara', '~> 3.39.1'
gem 'capybara-screenshot', '~> 1.0.26'
gem 'rake', '~> 13', '>= 13.0.6'
gem 'rspec', '~> 3.12'
@@ -18,7 +18,7 @@ gem 'rspec-retry', '~> 0.6.2', require: 'rspec/retry'
gem 'rspec_junit_formatter', '~> 0.6.0'
gem 'faker', '~> 3.2'
gem 'knapsack', '~> 4.0'
-gem 'parallel_tests', '~> 4.2'
+gem 'parallel_tests', '~> 4.2', '>= 4.2.1'
gem 'rotp', '~> 6.2.2'
gem 'parallel', '~> 1.23'
gem 'rainbow', '~> 3.1.1'
@@ -40,7 +40,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.3'
+gem 'nokogiri', '~> 1.14', '>= 1.14.4'
gem 'deprecation_toolkit', '~> 2.0.3', require: false
diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock
index a6d82f117e9..9b2b8acfb87 100644
--- a/qa/Gemfile.lock
+++ b/qa/Gemfile.lock
@@ -29,7 +29,7 @@ GEM
debug_inspector (>= 0.0.1)
builder (3.2.4)
byebug (11.1.3)
- capybara (3.39.0)
+ capybara (3.39.1)
addressable
matrix
mini_mime (>= 0.1.3)
@@ -190,7 +190,7 @@ GEM
multi_json (1.15.0)
multi_xml (0.6.0)
netrc (0.11.0)
- nokogiri (1.14.3)
+ nokogiri (1.14.4)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
octokit (6.1.1)
@@ -199,7 +199,7 @@ GEM
oj (3.13.23)
os (1.1.4)
parallel (1.23.0)
- parallel_tests (4.2.0)
+ parallel_tests (4.2.1)
parallel
parser (3.1.3.0)
ast (~> 2.4.1)
@@ -317,7 +317,7 @@ DEPENDENCIES
activesupport (~> 6.1.7.2)
airborne (~> 0.3.7)
allure-rspec (~> 2.20.0)
- capybara (~> 3.39.0)
+ capybara (~> 3.39.1)
capybara-screenshot (~> 1.0.26)
chemlab (~> 0.10)
chemlab-library-www-gitlab-com (~> 0.1, >= 0.1.1)
@@ -331,10 +331,10 @@ DEPENDENCIES
gitlab_quality-test_tooling (~> 0.4.0)
influxdb-client (~> 2.9)
knapsack (~> 4.0)
- nokogiri (~> 1.14, >= 1.14.3)
+ nokogiri (~> 1.14, >= 1.14.4)
octokit (~> 6.1.1)
parallel (~> 1.23)
- parallel_tests (~> 4.2)
+ parallel_tests (~> 4.2, >= 4.2.1)
pry-byebug (~> 3.10.1)
rainbow (~> 3.1.1)
rake (~> 13, >= 13.0.6)
@@ -353,4 +353,4 @@ DEPENDENCIES
zeitwerk (~> 2.6, >= 2.6.7)
BUNDLED WITH
- 2.4.12
+ 2.4.13