diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-18 06:09:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-18 06:09:05 +0300 |
| commit | 1f39f07db14d2525d305a824c0b390e96020aac6 (patch) | |
| tree | b3d9f4925cc506c860cb6bcc9367599b5bf5f388 | |
| parent | c8ccf45aa0aa17413b107f9bbf9d6f160eaa8779 (diff) | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | lib/tasks/gitlab/tw/codeowners.rake | 1 | ||||
| -rw-r--r-- | qa/Gemfile | 2 | ||||
| -rw-r--r-- | qa/Gemfile.lock | 6 |
3 files changed, 5 insertions, 4 deletions
diff --git a/lib/tasks/gitlab/tw/codeowners.rake b/lib/tasks/gitlab/tw/codeowners.rake index 77f5eb87725..0db77c54099 100644 --- a/lib/tasks/gitlab/tw/codeowners.rake +++ b/lib/tasks/gitlab/tw/codeowners.rake @@ -44,6 +44,7 @@ namespace :tw do CodeOwnerRule.new('Fuzz Testing', '@rdickenson'), CodeOwnerRule.new('Geo', '@axil'), CodeOwnerRule.new('Gitaly', '@eread'), + CodeOwnerRule.new('GitLab Dedicated', '@axil'), CodeOwnerRule.new('Global Search', '@ashrafkhamis'), CodeOwnerRule.new('Import', '@eread'), CodeOwnerRule.new('Infrastructure', '@sselhorn'), diff --git a/qa/Gemfile b/qa/Gemfile index 9e41b5ddeed..a55fb975a04 100644 --- a/qa/Gemfile +++ b/qa/Gemfile @@ -9,7 +9,7 @@ gem 'capybara', '~> 3.38.0' gem 'capybara-screenshot', '~> 1.0.26' gem 'rake', '~> 13', '>= 13.0.6' gem 'rspec', '~> 3.12' -gem 'selenium-webdriver', '~> 4.8' +gem 'selenium-webdriver', '~> 4.8', '>= 4.8.1' gem 'airborne', '~> 0.3.7', require: false # airborne is messing with rspec sandboxed mode so not requiring by default gem 'rest-client', '~> 2.1.0' gem 'rspec-retry', '~> 0.6.2', require: 'rspec/retry' diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock index d544aa685a5..96c5bb5f595 100644 --- a/qa/Gemfile.lock +++ b/qa/Gemfile.lock @@ -259,7 +259,7 @@ GEM sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) - selenium-webdriver (4.8.0) + selenium-webdriver (4.8.1) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -334,7 +334,7 @@ DEPENDENCIES rspec-retry (~> 0.6.2) rspec_junit_formatter (~> 0.6.0) ruby-debug-ide (~> 0.7.3) - selenium-webdriver (~> 4.8) + selenium-webdriver (~> 4.8, >= 4.8.1) slack-notifier (~> 2.4) terminal-table (~> 3.0.2) warning (~> 1.3) @@ -342,4 +342,4 @@ DEPENDENCIES zeitwerk (~> 2.6, >= 2.6.7) BUNDLED WITH - 2.4.6 + 2.4.7 |