VladPolskiy/gitlab-ce
1
0
Fork 0
mirror of https://github.com/gitlabhq/gitlabhq.git synced 2025-08-16 14:53:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add latest changes from gitlab-org/gitlab@16-5-stable-ee

Browse Source
This commit is contained in:
GitLab Bot
2024-08-07 03:21:11 +00:00
parent c5c1ec0de3
commit 468a5e0b12
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qa/Gemfile
View File

@ -2,7 +2,7 @@
source 'https://rubygems.org'
gem 'gitlab-qa', '~> 12', '>= 12.4.1', require: 'gitlab/qa'
gem 'gitlab-qa', '~> 12', '>= 12.4.1', git: 'https://gitlab.com/gitlab-org/gitlab-qa.git', branch: '16-5-stable' # rubocop:disable Cop/GemFetcher -- need to used a patched version of gitlab-qa so E2E tests pass in backports
gem 'gitlab_quality-test_tooling', '~> 0.9.3', require: false
gem 'gitlab-utils', path: '../gems/gitlab-utils'
gem 'activesupport', '~> 7.0.8' # This should stay in sync with the root's Gemfile

26
qa/Gemfile.lock
View File

@ -1,3 +1,18 @@
GIT
remote: https://gitlab.com/gitlab-org/gitlab-qa.git
revision: 1dc8493962f2fc91fe4a5daaf59b66593c4903f3
branch: 16-5-stable
specs:
gitlab-qa (12.4.1)
activesupport (>= 6.1, < 7.1)
gitlab (~> 4.19)
http (~> 5.0)
nokogiri (~> 1.10)
parallel (>= 1, < 2)
rainbow (>= 3, < 4)
table_print (= 1.5.7)
zeitwerk (>= 2, < 3)
PATH
remote: ../gems/gitlab-utils
specs:
@ -121,15 +136,6 @@ GEM
gitlab (4.19.0)
httparty (~> 0.20)
terminal-table (>= 1.5.1)
gitlab-qa (12.4.1)
activesupport (>= 6.1, < 7.1)
gitlab (~> 4.19)
http (~> 5.0)
nokogiri (~> 1.10)
parallel (>= 1, < 2)
rainbow (>= 3, < 4)
table_print (= 1.5.7)
zeitwerk (>= 2, < 3)
gitlab_quality-test_tooling (0.9.3)
activesupport (>= 6.1, < 7.1)
gitlab (~> 4.19)
@ -351,7 +357,7 @@ DEPENDENCIES
faraday-retry (~> 2.2)
fog-core (= 2.1.0)
fog-google (~> 1.19)
gitlab-qa (~> 12, >= 12.4.1)
gitlab-qa (~> 12, >= 12.4.1)!
gitlab-utils!
gitlab_quality-test_tooling (~> 0.9.3)
influxdb-client (~> 2.9)