diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-05 21:08:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-05 21:08:51 +0300 |
| commit | 9c05a84cac5e6519ef545b14ead8989719c6f612 (patch) | |
| tree | e93937c87050f9f9b5603bfe9b7f8aca86e146c8 /qa | |
| parent | d4e0452ed946ca0cf4dd0537675abeda7a4c0ffa (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/qa/specs/features/browser_ui/3_create/merge_request/merge_when_pipeline_succeeds_spec.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_when_pipeline_succeeds_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_when_pipeline_succeeds_spec.rb index 1b82543a5d4..38831f6f158 100644 --- a/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_when_pipeline_succeeds_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_when_pipeline_succeeds_spec.rb @@ -50,7 +50,10 @@ module QA runner&.remove_via_api! end - it 'merges after pipeline succeeds' do + it 'merges after pipeline succeeds', quarantine: { + type: :flaky, + issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/403017' + } do transient_test = repeat > 1 repeat.times do |i| |