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
c2ded9bd
Commit
c2ded9bd
authored
Oct 24, 2018
by
Filipa Lacerda
Committed by
Matija Čupić
Oct 24, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updates CI/CD documentation link in MR widget
parent
c40634d4
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
3 deletions
+18
-3
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
...ue_merge_request_widget/components/mr_widget_pipeline.vue
+16
-2
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
...avascripts/vue_merge_request_widget/mr_widget_options.vue
+1
-0
app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
...cripts/vue_merge_request_widget/stores/mr_widget_store.js
+1
-1
No files found.
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
View file @
c2ded9bd
<
script
>
<
script
>
/* eslint-disable vue/require-default-prop */
/* eslint-disable vue/require-default-prop */
import
{
sprintf
,
__
}
from
'
~/locale
'
;
import
PipelineStage
from
'
~/pipelines/components/stage.vue
'
;
import
PipelineStage
from
'
~/pipelines/components/stage.vue
'
;
import
CiIcon
from
'
~/vue_shared/components/ci_icon.vue
'
;
import
CiIcon
from
'
~/vue_shared/components/ci_icon.vue
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
...
@@ -36,6 +37,11 @@ export default {
...
@@ -36,6 +37,11 @@ export default {
type
:
String
,
type
:
String
,
required
:
false
,
required
:
false
,
},
},
troubleshootingDocsPath
:
{
type
:
String
,
required
:
false
,
default
:
''
,
},
},
},
computed
:
{
computed
:
{
hasPipeline
()
{
hasPipeline
()
{
...
@@ -57,6 +63,12 @@ export default {
...
@@ -57,6 +63,12 @@ export default {
hasCommitInfo
()
{
hasCommitInfo
()
{
return
this
.
pipeline
.
commit
&&
Object
.
keys
(
this
.
pipeline
.
commit
).
length
>
0
;
return
this
.
pipeline
.
commit
&&
Object
.
keys
(
this
.
pipeline
.
commit
).
length
>
0
;
},
},
errorText
()
{
return
sprintf
(
__
(
'
Could not retrieve the pipeline status. For troubleshooting steps, read the %{linkStart}documentation.%{linkEnd}
'
),
{
linkStart
:
`<a href="
${
this
.
troubleshootingDocsPath
}
">`
,
linkEnd
:
'
</a>
'
,
});
}
},
},
};
};
</
script
>
</
script
>
...
@@ -77,8 +89,10 @@ export default {
...
@@ -77,8 +89,10 @@ export default {
name=
"status_failed_borderless"
name=
"status_failed_borderless"
/>
/>
</div>
</div>
<div
class=
"media-body"
>
<div
Could not retrieve the pipeline status. For potential solutions please read the
<a
:href=
"mr.troubleshootingDocsPath"
>
documentation
</a>
.
class=
"media-body"
v-html=
"errorText"
>
</div>
</div>
</
template
>
</
template
>
<
template
v-else-if=
"hasPipeline"
>
<
template
v-else-if=
"hasPipeline"
>
...
...
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
View file @
c2ded9bd
...
@@ -266,6 +266,7 @@ export default {
...
@@ -266,6 +266,7 @@ export default {
:has-ci=
"mr.hasCI"
:has-ci=
"mr.hasCI"
:source-branch=
"mr.sourceBranch"
:source-branch=
"mr.sourceBranch"
:source-branch-link=
"mr.sourceBranchLink"
:source-branch-link=
"mr.sourceBranchLink"
:troubleshooting-docs-path=
"mr.troubleshootingDocsPath"
/>
/>
<deployment
<deployment
v-for=
"deployment in mr.deployments"
v-for=
"deployment in mr.deployments"
...
...
app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
View file @
c2ded9bd
...
@@ -18,7 +18,7 @@ export default class MergeRequestStore {
...
@@ -18,7 +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
.
troubleshootingDocsPath
=
data
.
troubleshooting_docs_path
;
this
.
enableSquashBeforeMerge
=
this
.
enableSquashBeforeMerge
||
true
;
this
.
enableSquashBeforeMerge
=
this
.
enableSquashBeforeMerge
||
true
;
this
.
iid
=
data
.
iid
;
this
.
iid
=
data
.
iid
;
...
...
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