diff options
author | Matija Čupić <matteeyah@gmail.com> | 2018-10-23 17:15:53 +0200 |
---|---|---|
committer | Matija Čupić <matteeyah@gmail.com> | 2018-10-24 20:16:14 +0200 |
commit | c40634d41c42bff36a984f3f01d8f0bed65438f3 (patch) | |
tree | b569fcd150c2c5efb1ffe27d50030813442cd7b0 | |
parent | 67f03c0d8e4e7bd7ce687207b6f93a09d2dc0f20 (diff) | |
download | gitlab-ce-c40634d41c42bff36a984f3f01d8f0bed65438f3.tar.gz |
Fix the troubleshooting docs link
3 files changed, 3 insertions, 4 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 aeeedacd429..bdeae203e48 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="mr.troubleshootingDocsLink">documentation</a>. + Could not retrieve the pipeline status. For potential solutions please read the <a :href="mr.troubleshootingDocsPath">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 f0f5b8008f9..60040091f42 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 @@ -18,6 +18,7 @@ export default class MergeRequestStore { this.squash = data.squash; this.squashBeforeMergeHelpPath = this.squashBeforeMergeHelpPath || data.squash_before_merge_help_path; + this.troubleshootingDocsPath = data.troubleshooting_docs_path this.enableSquashBeforeMerge = this.enableSquashBeforeMerge || true; this.iid = data.iid; @@ -110,8 +111,6 @@ 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 9216e33222c..5d1bbb077af 100644 --- a/app/views/projects/merge_requests/show.html.haml +++ b/app/views/projects/merge_requests/show.html.haml @@ -5,7 +5,6 @@ - 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" @@ -22,6 +21,7 @@ window.gl.mrWidgetData = #{serialize_issuable(@merge_request, serializer: 'widget')} window.gl.mrWidgetData.squash_before_merge_help_path = '#{help_page_path("user/project/merge_requests/squash_and_merge")}'; + window.gl.mrWidgetData.troubleshooting_docs_path = '#{help_page_path('user/project/merge_requests', anchor: 'troubleshooting')}'; #js-vue-mr-widget.mr-widget |