Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Friend <nathan@gitlab.com>2019-04-15 16:25:48 +0300
committerNathan Friend <nathan@gitlab.com>2019-04-15 16:25:48 +0300
commit12170f8320c3bbe5b6bbdbda83ac7a163826b34a (patch)
treeb541b90a01ce8062ce5e0edd8da49e5ced6e7346 /app/presenters
parentb99b6bb0960f749e1ba9a129be9c0365e306ed96 (diff)
Add two warning messages to the MR widget
This commit adds two new warning messages to the MR widget that handle cases involving merge request pipelines.
Diffstat (limited to 'app/presenters')
-rw-r--r--app/presenters/merge_request_presenter.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/presenters/merge_request_presenter.rb b/app/presenters/merge_request_presenter.rb
index 284b1ad9b55..55103c0a95c 100644
--- a/app/presenters/merge_request_presenter.rb
+++ b/app/presenters/merge_request_presenter.rb
@@ -209,6 +209,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?