Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
92d290c9
Commit
92d290c9
authored
May 23, 2017
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set merge params to force_remove_source_branch by default.
parent
ff5044d8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb
...tures/merge_requests/merge_when_pipeline_succeeds_spec.rb
+4
-2
No files found.
spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb
View file @
92d290c9
...
@@ -7,7 +7,8 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do
...
@@ -7,7 +7,8 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do
let
(
:merge_request
)
do
let
(
:merge_request
)
do
create
(
:merge_request_with_diffs
,
source_project:
project
,
create
(
:merge_request_with_diffs
,
source_project:
project
,
author:
user
,
author:
user
,
title:
'Bug NS-04'
)
title:
'Bug NS-04'
,
merge_params:
{
force_remove_source_branch:
'1'
})
end
end
let
(
:pipeline
)
do
let
(
:pipeline
)
do
...
@@ -82,7 +83,8 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do
...
@@ -82,7 +83,8 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do
source_project:
project
,
source_project:
project
,
title:
'Bug NS-04'
,
title:
'Bug NS-04'
,
author:
user
,
author:
user
,
merge_user:
user
)
merge_user:
user
,
merge_params:
{
force_remove_source_branch:
'1'
})
end
end
before
do
before
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment