diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-03-01 20:30:51 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-03-01 20:30:51 +0000 |
| commit | 7e2ad5d47a1d95281e2a217538dae67107a584c2 (patch) | |
| tree | e86d3395d583d3bee5804aa09656a3e2db5e7d8b /app/helpers | |
| parent | a87815fbc07359d83918e1ff61961af174f76fe0 (diff) | |
| parent | a0101ebf84ed397899df8f3a017d2b25dc45db57 (diff) | |
| download | gitlab-ce-7e2ad5d47a1d95281e2a217538dae67107a584c2.tar.gz | |
Merge branch 'fix/mwbs-to-mwps' into 'master'
Rename MWBS to MWPS
Closes #24707
See merge request !9335
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/merge_requests_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 7d8505d704e..38be073c8dc 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -146,7 +146,7 @@ module MergeRequestsHelper def merge_params(merge_request) { - merge_when_build_succeeds: true, + merge_when_pipeline_succeeds: true, should_remove_source_branch: true, sha: merge_request.diff_head_sha }.merge(merge_params_ee(merge_request)) |