diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-04 00:10:02 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-04 00:10:02 +0300 |
| commit | 8e2f50b44d51768c38d300a2ba2f9208107933b2 (patch) | |
| tree | ea5c7ae41c2b9d4130dd37fcdd072dee7e39915f /qa | |
| parent | 524639c7063131c40b848789ff541758b68c1cca (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_merge_request_from_fork_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb index c2e148e19bd..dd4b3276687 100644 --- a/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb @@ -2,7 +2,8 @@ module QA RSpec.describe 'Create' do - describe 'Merge request creation from fork', :smoke do + describe 'Merge request creation from fork' do + # TODO: Please add this back to :smoke suite as soon as https://gitlab.com/gitlab-org/gitlab/-/issues/332588 is addressed it 'can merge feature branch fork to mainline', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/issues/1701' do merge_request = Resource::MergeRequestFromFork.fabricate_via_browser_ui! do |merge_request| merge_request.fork_branch = 'feature-branch' |