Fix the troubleshooting docs link
This commit is contained in:
parent
67f03c0d8e
commit
c40634d41c
3 changed files with 3 additions and 4 deletions
|
@ -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">
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue