Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
c40634d4
Commit
c40634d4
authored
Oct 23, 2018
by
Matija Čupić
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the troubleshooting docs link
parent
67f03c0d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
+3
-4
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
...ue_merge_request_widget/components/mr_widget_pipeline.vue
+1
-1
app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
...cripts/vue_merge_request_widget/stores/mr_widget_store.js
+1
-2
app/views/projects/merge_requests/show.html.haml
app/views/projects/merge_requests/show.html.haml
+1
-1
No files found.
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
View file @
c40634d4
...
@@ -78,7 +78,7 @@ export default {
...
@@ -78,7 +78,7 @@ export default {
/>
/>
</div>
</div>
<div
class=
"media-body"
>
<div
class=
"media-body"
>
Could not retrieve the pipeline status. For potential solutions please read the
<a
:href=
"mr.troubleshootingDocs
Link
"
>
documentation
</a>
.
Could not retrieve the pipeline status. For potential solutions please read the
<a
:href=
"mr.troubleshootingDocs
Path
"
>
documentation
</a>
.
</div>
</div>
</
template
>
</
template
>
<
template
v-else-if=
"hasPipeline"
>
<
template
v-else-if=
"hasPipeline"
>
...
...
app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
View file @
c40634d4
...
@@ -18,6 +18,7 @@ export default class MergeRequestStore {
...
@@ -18,6 +18,7 @@ export default class MergeRequestStore {
this
.
squash
=
data
.
squash
;
this
.
squash
=
data
.
squash
;
this
.
squashBeforeMergeHelpPath
=
this
.
squashBeforeMergeHelpPath
=
this
.
squashBeforeMergeHelpPath
||
data
.
squash_before_merge_help_path
;
this
.
squashBeforeMergeHelpPath
||
data
.
squash_before_merge_help_path
;
this
.
troubleshootingDocsPath
=
data
.
troubleshooting_docs_path
this
.
enableSquashBeforeMerge
=
this
.
enableSquashBeforeMerge
||
true
;
this
.
enableSquashBeforeMerge
=
this
.
enableSquashBeforeMerge
||
true
;
this
.
iid
=
data
.
iid
;
this
.
iid
=
data
.
iid
;
...
@@ -110,8 +111,6 @@ export default class MergeRequestStore {
...
@@ -110,8 +111,6 @@ export default class MergeRequestStore {
this
.
testResultsPath
=
data
.
test_reports_path
;
this
.
testResultsPath
=
data
.
test_reports_path
;
this
.
troubleshootingDocsLink
=
data
.
troubleshooting_docs_link
this
.
setState
(
data
);
this
.
setState
(
data
);
}
}
...
...
app/views/projects/merge_requests/show.html.haml
View file @
c40634d4
...
@@ -5,7 +5,6 @@
...
@@ -5,7 +5,6 @@
-
page_title
"
#{
@merge_request
.
title
}
(
#{
@merge_request
.
to_reference
}
)"
,
"Merge Requests"
-
page_title
"
#{
@merge_request
.
title
}
(
#{
@merge_request
.
to_reference
}
)"
,
"Merge Requests"
-
page_description
@merge_request
.
description
-
page_description
@merge_request
.
description
-
page_card_attributes
@merge_request
.
card_attributes
-
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
)
}
}
.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"
=
render
"projects/merge_requests/mr_title"
...
@@ -22,6 +21,7 @@
...
@@ -22,6 +21,7 @@
window
.
gl
.
mrWidgetData
=
#{
serialize_issuable
(
@merge_request
,
serializer:
'widget'
)
}
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
.
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
#js-vue-mr-widget
.mr-widget
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment