diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-19 12:15:59 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-19 12:15:59 +0000 |
| commit | 2017bc90a671eac669f0114b6ef508e151409c4f (patch) | |
| tree | 79bbbedede417d3ce13ae2e13dd1ad3bb069c975 /qa | |
| parent | 9450a63064cd1572f030628dbf155f5c047f28c7 (diff) | |
| download | gitlab-ce-2017bc90a671eac669f0114b6ef508e151409c4f.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/Gemfile | 2 | ||||
| -rw-r--r-- | qa/Gemfile.lock | 4 | ||||
| -rw-r--r-- | qa/qa/specs/features/browser_ui/3_create/pages/new_static_page_spec.rb | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/qa/Gemfile b/qa/Gemfile index 4f138efd06c..abb654b4a96 100644 --- a/qa/Gemfile +++ b/qa/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' -gem 'gitlab-qa', '~> 10', '>= 10.2.1', require: 'gitlab/qa' +gem 'gitlab-qa', '~> 10', '>= 10.3.0', require: 'gitlab/qa' 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' diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock index ce37fee0ad4..e86a5526fc8 100644 --- a/qa/Gemfile.lock +++ b/qa/Gemfile.lock @@ -102,7 +102,7 @@ GEM gitlab (4.18.0) httparty (~> 0.18) terminal-table (>= 1.5.1) - gitlab-qa (10.2.1) + gitlab-qa (10.3.0) activesupport (~> 6.1) gitlab (~> 4.18.0) http (~> 5.0) @@ -318,7 +318,7 @@ DEPENDENCIES faraday-retry (~> 2.1) fog-core (= 2.1.0) fog-google (~> 1.19) - gitlab-qa (~> 10, >= 10.2.1) + gitlab-qa (~> 10, >= 10.3.0) influxdb-client (~> 2.9) knapsack (~> 4.0) nokogiri (~> 1.14, >= 1.14.3) diff --git a/qa/qa/specs/features/browser_ui/3_create/pages/new_static_page_spec.rb b/qa/qa/specs/features/browser_ui/3_create/pages/new_static_page_spec.rb index ed4bd7c6980..7dc9e95bcd2 100644 --- a/qa/qa/specs/features/browser_ui/3_create/pages/new_static_page_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/pages/new_static_page_spec.rb @@ -7,8 +7,7 @@ module QA except: { job: 'review-qa-*' }, quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/383215', - type: :test_environment, - only: { subdomain: 'staging-ref' } + type: :flaky }, feature_flag: { name: 'show_pages_in_deployments_menu' } do # TODO: Convert back to :smoke once proved to be stable. Related issue: https://gitlab.com/gitlab-org/gitlab/-/issues/300906 |