diff options
author | Phil Hughes <me@iamphill.com> | 2018-05-30 07:38:31 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-05-30 07:38:31 +0000 |
commit | fd79df64c5411308e67a62b4c02a07f5317ddec1 (patch) | |
tree | 8f923668b4abebc14cba1923acdd7700a8f3ba96 /app/helpers | |
parent | e869387ca27f9a9ac34f6398876714199fc3100e (diff) | |
parent | 4cff66a6c46361e8d775ea3f5a80bf147d4020b3 (diff) | |
download | gitlab-ce-fd79df64c5411308e67a62b4c02a07f5317ddec1.tar.gz |
Merge branch 'blackst0ne-squash-and-merge-in-gitlab-core-ce' into 'master'
Resolve "Squash and merge in GitLab Core (CE)"
Closes #34591
See merge request gitlab-org/gitlab-ce!18956
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/merge_requests_helper.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb index c19c5b9cc82..74251c260f0 100644 --- a/app/helpers/merge_requests_helper.rb +++ b/app/helpers/merge_requests_helper.rb @@ -97,8 +97,9 @@ module MergeRequestsHelper { merge_when_pipeline_succeeds: true, should_remove_source_branch: true, - sha: merge_request.diff_head_sha - }.merge(merge_params_ee(merge_request)) + sha: merge_request.diff_head_sha, + squash: merge_request.squash + } end def tab_link_for(merge_request, tab, options = {}, &block) @@ -149,8 +150,4 @@ module MergeRequestsHelper current_user.fork_of(project) end end - - def merge_params_ee(merge_request) - {} - end end |