diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-06-03 11:24:59 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-06-03 11:24:59 +0000 |
| commit | a7fd826a539c39b6c3a5cf3a6ed3a49c437f865e (patch) | |
| tree | 78cade8f550bdf2930527269f48e02d6766342c2 /app/presenters | |
| parent | b2d7b7adc029f07c3e84bc7f84d2cba31f6cf31a (diff) | |
| parent | 84e550fad9c95dd19bb1739fc48ef6694c9f737d (diff) | |
| download | gitlab-ce-a7fd826a539c39b6c3a5cf3a6ed3a49c437f865e.tar.gz | |
Merge branch 'abstract-auto-merge' into 'master'
Refactor and abstract Auto Merge Processes
See merge request gitlab-org/gitlab-ce!28595
Diffstat (limited to 'app/presenters')
| -rw-r--r-- | app/presenters/merge_request_presenter.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/presenters/merge_request_presenter.rb b/app/presenters/merge_request_presenter.rb index ba0711ca867..9c44ed711a6 100644 --- a/app/presenters/merge_request_presenter.rb +++ b/app/presenters/merge_request_presenter.rb @@ -22,9 +22,9 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated end end - def cancel_merge_when_pipeline_succeeds_path - if can_cancel_merge_when_pipeline_succeeds?(current_user) - cancel_merge_when_pipeline_succeeds_project_merge_request_path(project, merge_request) + def cancel_auto_merge_path + if can_cancel_auto_merge?(current_user) + cancel_auto_merge_project_merge_request_path(project, merge_request) end end |