diff options
| author | Phil Hughes <me@iamphill.com> | 2018-12-21 13:47:03 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-01-07 12:17:04 +0300 |
| commit | aae6d174948a238abf05af2d3038d80b5e8750f4 (patch) | |
| tree | 4fd28fc7358cb7602ffd527e152260c90a1f4da0 /app/presenters | |
| parent | 301315f3b3e5ffe43c3de1f7f15e4e3a307c0912 (diff) | |
Disable resolve conflicts for protected branches
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53463
Diffstat (limited to 'app/presenters')
| -rw-r--r-- | app/presenters/merge_request_presenter.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/presenters/merge_request_presenter.rb b/app/presenters/merge_request_presenter.rb index 1db6c9eff36..44b6ca299ae 100644 --- a/app/presenters/merge_request_presenter.rb +++ b/app/presenters/merge_request_presenter.rb @@ -189,6 +189,10 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated merge_request.subscribed?(current_user, merge_request.target_project) end + def conflicts_docs_path + help_page_path('user/project/merge_requests/resolve_conflicts.md') + end + private def cached_can_be_reverted? |