summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-04-18 21:09:17 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-04-18 21:09:17 +0000
commita407a618ae21dce15c85ae15c465a531811a69b9 (patch)
tree698b42a38f42ae333c58e48f9f954d23035c5f64 /qa
parent9f2bc6fc4c27d0703260352c79463fbc62555ac8 (diff)
downloadgitlab-ce-a407a618ae21dce15c85ae15c465a531811a69b9.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 16d9cf9e74a..cd28fd0f0ae 100644
--- a/qa/Gemfile
+++ b/qa/Gemfile
@@ -14,7 +14,7 @@ gem 'airborne', '~> 0.3.7', require: false # airborne is messing with rspec sand
gem 'rest-client', '~> 2.1.0'
gem 'rspec-retry', '~> 0.6.2', require: 'rspec/retry'
gem 'rspec_junit_formatter', '~> 0.6.0'
-gem 'faker', '~> 3.1', '>= 3.1.1'
+gem 'faker', '~> 3.2'
gem 'knapsack', '~> 4.0'
gem 'parallel_tests', '~> 4.2'
gem 'rotp', '~> 6.2.2'
diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock
index 10e3de2b999..b646afd665d 100644
--- a/qa/Gemfile.lock
+++ b/qa/Gemfile.lock
@@ -63,7 +63,7 @@ GEM
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
excon (0.92.4)
- faker (3.1.1)
+ faker (3.2.0)
i18n (>= 1.8.11, < 2)
faraday (2.5.2)
faraday-net_http (>= 2.0, < 3.1)
@@ -314,7 +314,7 @@ DEPENDENCIES
chemlab-library-www-gitlab-com (~> 0.1, >= 0.1.1)
confiner (~> 0.4)
deprecation_toolkit (~> 2.0.3)
- faker (~> 3.1, >= 3.1.1)
+ faker (~> 3.2)
faraday-retry (~> 2.1)
fog-core (= 2.1.0)
fog-google (~> 1.19)