Commit 97f2dcbd authored by Robert Speicher's avatar Robert Speicher

Merge branch 'qa-e2e-quarantine-file-lock' into 'master'

Quarantine file lock spec due to bug in code

See merge request gitlab-org/gitlab!21674
parents 14c536f7 2e87df2e
...@@ -59,7 +59,8 @@ module QA ...@@ -59,7 +59,8 @@ module QA
end end
end end
it 'creates a merge request and fails to merge' do # https://gitlab.com/gitlab-org/gitlab/issues/43105
it 'creates a merge request and fails to merge', :quarantine do
push branch: 'test', as_user: @user_one push branch: 'test', as_user: @user_one
merge_request = Resource::MergeRequest.fabricate_via_api! do |merge_request| merge_request = Resource::MergeRequest.fabricate_via_api! do |merge_request|
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment