diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-03 15:07:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-03 15:07:09 +0300 |
commit | b2b3ee8f5fe421a8b01c21d534956b5161efa9bf (patch) | |
tree | e62390ea031eebbc5844ec66c2db1cee2588d895 | |
parent | 156d3caaba403508a0e01058a72ca84e536fabdd (diff) |
Add latest changes from gitlab-org/gitlab@master
5 files changed, 10 insertions, 7 deletions
diff --git a/qa/qa/specs/features/api/3_create/repository/add_list_delete_branches_spec.rb b/qa/qa/specs/features/api/3_create/repository/add_list_delete_branches_spec.rb index 2f7cef2112e..c9f5fd40a78 100644 --- a/qa/qa/specs/features/api/3_create/repository/add_list_delete_branches_spec.rb +++ b/qa/qa/specs/features/api/3_create/repository/add_list_delete_branches_spec.rb @@ -31,7 +31,7 @@ module QA end it( - 'creates, retrieves and deletes branches', + 'creates, retrieves and deletes branches', :reliable, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347740' ) do # Create branch diff --git a/qa/qa/specs/features/api/3_create/repository/default_branch_name_setting_spec.rb b/qa/qa/specs/features/api/3_create/repository/default_branch_name_setting_spec.rb index 3a6874cd587..00e3f90ba41 100644 --- a/qa/qa/specs/features/api/3_create/repository/default_branch_name_setting_spec.rb +++ b/qa/qa/specs/features/api/3_create/repository/default_branch_name_setting_spec.rb @@ -11,7 +11,8 @@ module QA Runtime::ApplicationSettings.restore_application_settings(:default_branch_name) end - it 'sets the default branch name for a new project', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347837' do + it 'sets the default branch name for a new project', :reliable, + testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347837' do project = create(:project, :with_readme, name: 'default-branch-name') # It takes a moment to create the project. We wait until we @@ -27,7 +28,8 @@ module QA end end - it 'allows a project to be created via the CLI with a different default branch name', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347838' do + it 'allows a project to be created via the CLI with a different default branch name', :reliable, + testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347838' do project_name = "default-branch-name-via-cli-#{SecureRandom.hex(8)}" group = create(:group) diff --git a/qa/qa/specs/features/api/3_create/repository/project_archive_compare_spec.rb b/qa/qa/specs/features/api/3_create/repository/project_archive_compare_spec.rb index 9817915e9eb..a7af271a38e 100644 --- a/qa/qa/specs/features/api/3_create/repository/project_archive_compare_spec.rb +++ b/qa/qa/specs/features/api/3_create/repository/project_archive_compare_spec.rb @@ -28,7 +28,8 @@ module QA end end - it 'download archives of each user project then check they are different', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347748' do + it 'download archives of each user project then check they are different', :reliable, + testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347748' do archive_checksums = {} users.each do |user_key, user_info| diff --git a/qa/qa/specs/features/api/3_create/repository/storage_size_spec.rb b/qa/qa/specs/features/api/3_create/repository/storage_size_spec.rb index 72ce2dda053..ac69f0fb686 100644 --- a/qa/qa/specs/features/api/3_create/repository/storage_size_spec.rb +++ b/qa/qa/specs/features/api/3_create/repository/storage_size_spec.rb @@ -28,7 +28,7 @@ module QA # # There are unit tests to verify the accuracy of GitLab's determination of repo size, so for this test we # attempt to detect large differences that could indicate a regression to previous behavior. - it 'matches cloned repo usage to reported usage', + it 'matches cloned repo usage to reported usage', :reliable, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/365196' do project = create(:project, name: project_name) diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_file_size_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_file_size_spec.rb index 76aba401aaa..96aad8c9957 100644 --- a/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_file_size_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_file_size_spec.rb @@ -14,7 +14,7 @@ module QA end it( - 'push successful when the file size is under the limit', + 'push successful when the file size is under the limit', :reliable, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347758' ) do set_file_size_limit(5) @@ -27,7 +27,7 @@ module QA end it( - 'push fails when the file size is above the limit', + 'push fails when the file size is above the limit', :reliable, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347759' ) do set_file_size_limit(2) |