diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2018-10-23 15:55:46 +0200 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2018-10-24 20:16:14 +0200 |
| commit | 67f03c0d8e4e7bd7ce687207b6f93a09d2dc0f20 (patch) | |
| tree | 3c17acdecfe4b26b5e911da627bb315782771912 | |
| parent | 28b7bc2bfeee4c69dbfda60f80af71715ee5202e (diff) | |
| download | gitlab-ce-67f03c0d8e4e7bd7ce687207b6f93a09d2dc0f20.tar.gz | |
Add docs link
3 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue index 718fd3507b2..aeeedacd429 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue @@ -78,7 +78,7 @@ export default { /> </div> <div class="media-body"> - Could not retrieve the pipeline status. For potential solutions please read the <a href="#">documentation</a>. + Could not retrieve the pipeline status. For potential solutions please read the <a :href="mr.troubleshootingDocsLink">documentation</a>. </div> </template> <template v-else-if="hasPipeline"> diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js index 672e5280b5e..f0f5b8008f9 100644 --- a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js +++ b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js @@ -110,6 +110,8 @@ export default class MergeRequestStore { this.testResultsPath = data.test_reports_path; + this.troubleshootingDocsLink = data.troubleshooting_docs_link + this.setState(data); } diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml index efc2d88172e..9216e33222c 100644 --- a/app/views/projects/merge_requests/show.html.haml +++ b/app/views/projects/merge_requests/show.html.haml @@ -5,6 +5,7 @@ - page_title "#{@merge_request.title} (#{@merge_request.to_reference})", "Merge Requests" - page_description @merge_request.description - page_card_attributes @merge_request.card_attributes +- troubleshooting_docs_link help_page_path('user/project/merge_requests', anchor: 'troubleshooting') .merge-request{ data: { mr_action: j(params[:tab].presence || 'show'), url: merge_request_path(@merge_request, format: :json), project_path: project_path(@merge_request.project) } } = render "projects/merge_requests/mr_title" |