diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-03 12:22:50 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-02-03 12:22:50 +0000 |
| commit | 1ca6e99d3850ee39588a9f518ffb53d3fb09e626 (patch) | |
| tree | d9f679d984c14927d99484e5471f180021a924fb /app/helpers | |
| parent | 7dc8b6b2045d84ff232731ef92f2cac916732753 (diff) | |
| parent | 7550f60ddeecebac3f84e8690ab3f42428600ff7 (diff) | |
| download | gitlab-ce-1ca6e99d3850ee39588a9f518ffb53d3fb09e626.tar.gz | |
Merge branch 'squash' into 'master'
Backport changes from EE squash
See merge request !8912
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/merge_requests_helper.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index 8c2c4e8833b..83ff898e68a 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -143,4 +143,16 @@ module MergeRequestsHelper def different_base?(version1, version2) version1 && version2 && version1.base_commit_sha != version2.base_commit_sha end + + def merge_params(merge_request) + { + merge_when_build_succeeds: true, + should_remove_source_branch: true, + sha: merge_request.diff_head_sha + }.merge(merge_params_ee(merge_request)) + end + + def merge_params_ee(merge_request) + {} + end end |