Skip to content

G
gitlab-ce
Commit a20a8552 authored by Imre Farkas's avatar Imre Farkas
Browse files
Options

Merge branch 'ps-remove-unused-helper' into 'master' 

Remove unused helper

See merge request gitlab-org/gitlab!42713
parents ca421dc9 5d2edfb9
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
app/helpers/merge_requests_helper.rb
View file @ a20a8552
...@@ -109,10 +109,6 @@ module MergeRequestsHelper ...@@ -109,10 +109,6 @@ module MergeRequestsHelper
@merge_request_diffs.size - @merge_request_diffs.index(merge_request_diff) @merge_request_diffs.size - @merge_request_diffs.index(merge_request_diff)
end end
def different_base?(version1, version2)
version1 && version2 && version1.base_commit_sha != version2.base_commit_sha
end
def merge_params(merge_request) def merge_params(merge_request)
{ {
auto_merge_strategy: AutoMergeService::STRATEGY_MERGE_WHEN_PIPELINE_SUCCEEDS, auto_merge_strategy: AutoMergeService::STRATEGY_MERGE_WHEN_PIPELINE_SUCCEEDS,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7