diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-31 15:11:01 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-31 15:11:01 +0300 |
commit | f52f8542b47c9e00ddf420abaf2263de168988f9 (patch) | |
tree | 568225882da5cc4deb746d2d4fc362c6076fb708 /qa | |
parent | 6a5ef9b75d38f39cd2a6a2392fadfbd3b966b884 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
-rw-r--r-- | qa/Gemfile | 2 | ||||
-rw-r--r-- | qa/Gemfile.lock | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/qa/Gemfile b/qa/Gemfile index a52385d314b..06de6004742 100644 --- a/qa/Gemfile +++ b/qa/Gemfile @@ -9,7 +9,7 @@ gem 'activesupport', '~> 7.0.8' # This should stay in sync with the root's Gemfi gem 'allure-rspec', '~> 2.20.0' gem 'capybara', '~> 3.39.2' gem 'capybara-screenshot', '~> 1.0.26' -gem 'rake', '~> 13', '>= 13.0.6' +gem 'rake', '~> 13', '>= 13.1.0' gem 'rspec', '~> 3.12' gem 'selenium-webdriver', '= 4.14.0' gem 'airborne', '~> 0.3.7', require: false # airborne is messing with rspec sandboxed mode so not requiring by default diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock index 30fd3691521..81602f9ecce 100644 --- a/qa/Gemfile.lock +++ b/qa/Gemfile.lock @@ -246,7 +246,7 @@ GEM rails-html-sanitizer (1.5.0) loofah (~> 2.19, >= 2.19.1) rainbow (3.1.1) - rake (13.0.6) + rake (13.1.0) regexp_parser (2.1.1) representable (3.2.0) declarative (< 0.1.0) @@ -362,7 +362,7 @@ DEPENDENCIES parallel_tests (~> 4.2, >= 4.2.1) pry-byebug (~> 3.10.1) rainbow (~> 3.1.1) - rake (~> 13, >= 13.0.6) + rake (~> 13, >= 13.1.0) rest-client (~> 2.1.0) rotp (~> 6.3.0) rspec (~> 3.12) @@ -377,4 +377,4 @@ DEPENDENCIES zeitwerk (~> 2.6, >= 2.6.8) BUNDLED WITH - 2.4.20 + 2.4.21 |