kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Set merge params to force_remove_source_branch by default.

This commit is contained in:
Bryce Johnson 2017-05-23 12:40:17 -04:00
parent ff5044d8e9
commit 92d290c97b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb
View File

@ -7,7 +7,8 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do
let(:merge_request) do
create(:merge_request_with_diffs, source_project: project,
author: user,
title: 'Bug NS-04')
title: 'Bug NS-04',
merge_params: { force_remove_source_branch: '1' })
end
let(:pipeline) do
@ -82,7 +83,8 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do
source_project: project,
title: 'Bug NS-04',
author: user,
merge_user: user)
merge_user: user,
merge_params: { force_remove_source_branch: '1' })
end
before do