diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-04-16 14:21:50 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-04-16 14:21:50 +0000 |
| commit | cd509d991ec43b05994af1c157ef724af7f04e8f (patch) | |
| tree | 811b8c65b6e825db3af4e8ca932683b10a74322c /app/presenters | |
| parent | 2dbbe7348b4156dea1f5229fd3e5db43ccad8834 (diff) | |
| parent | 12170f8320c3bbe5b6bbdbda83ac7a163826b34a (diff) | |
| download | gitlab-ce-cd509d991ec43b05994af1c157ef724af7f04e8f.tar.gz | |
Merge branch 'nfriend-update-merge-request-widget-for-post-merge-pipelines' into 'master'
Update merge request widget to accommodate post-merge pipelines
See merge request gitlab-org/gitlab-ce!25983
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 0c5369ba32c..3f7b5bebb74 100644 --- a/app/presenters/merge_request_presenter.rb +++ b/app/presenters/merge_request_presenter.rb @@ -212,6 +212,10 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated help_page_path('user/project/merge_requests/resolve_conflicts.md') end + def merge_request_pipelines_docs_path + help_page_path('ci/merge_request_pipelines/index.md') + end + private def cached_can_be_reverted? |