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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
95cbd41f
Commit
95cbd41f
authored
6 years ago
by
Filipa Lacerda
Committed by
Matija Čupić
6 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Regenerates pot files
Makes documentation path a required prop
parent
c2ded9bd
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
5 deletions
+17
-5
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
...ue_merge_request_widget/components/mr_widget_pipeline.vue
+2
-3
locale/gitlab.pot
locale/gitlab.pot
+3
-0
spec/features/merge_request/user_sees_merge_widget_spec.rb
spec/features/merge_request/user_sees_merge_widget_spec.rb
+1
-1
spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js
...ripts/vue_mr_widget/components/mr_widget_pipeline_spec.js
+10
-1
spec/javascripts/vue_mr_widget/mock_data.js
spec/javascripts/vue_mr_widget/mock_data.js
+1
-0
No files found.
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
View file @
95cbd41f
...
@@ -39,8 +39,7 @@ export default {
...
@@ -39,8 +39,7 @@ export default {
},
},
troubleshootingDocsPath
:
{
troubleshootingDocsPath
:
{
type
:
String
,
type
:
String
,
required
:
false
,
required
:
true
,
default
:
''
,
},
},
},
},
computed
:
{
computed
:
{
...
@@ -68,7 +67,7 @@ export default {
...
@@ -68,7 +67,7 @@ export default {
linkStart
:
`<a href="
${
this
.
troubleshootingDocsPath
}
">`
,
linkStart
:
`<a href="
${
this
.
troubleshootingDocsPath
}
">`
,
linkEnd
:
'
</a>
'
,
linkEnd
:
'
</a>
'
,
});
});
}
}
,
},
},
};
};
</
script
>
</
script
>
...
...
This diff is collapsed.
Click to expand it.
locale/gitlab.pot
View file @
95cbd41f
...
@@ -1983,6 +1983,9 @@ msgstr ""
...
@@ -1983,6 +1983,9 @@ msgstr ""
msgid "Copy token to clipboard"
msgid "Copy token to clipboard"
msgstr ""
msgstr ""
msgid "Could not retrieve the pipeline status. For troubleshooting steps, read the %{linkStart}documentation.%{linkEnd}"
msgstr ""
msgid "Create"
msgid "Create"
msgstr ""
msgstr ""
...
...
This diff is collapsed.
Click to expand it.
spec/features/merge_request/user_sees_merge_widget_spec.rb
View file @
95cbd41f
...
@@ -174,7 +174,7 @@ describe 'Merge request > User sees merge widget', :js do
...
@@ -174,7 +174,7 @@ describe 'Merge request > User sees merge widget', :js do
# Wait for the `ci_status` and `merge_check` requests
# Wait for the `ci_status` and `merge_check` requests
wait_for_requests
wait_for_requests
expect
(
page
).
to
have_text
(
'Could not retrieve the pipeline status. For
potential solutions please read the documentation.
'
)
expect
(
page
).
to
have_text
(
'Could not retrieve the pipeline status. For
troubleshooting steps, read the <a href=\"\">documentation.</a>
'
)
end
end
end
end
...
...
This diff is collapsed.
Click to expand it.
spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js
View file @
95cbd41f
...
@@ -22,6 +22,7 @@ describe('MRWidgetPipeline', () => {
...
@@ -22,6 +22,7 @@ describe('MRWidgetPipeline', () => {
pipeline
:
mockData
.
pipeline
,
pipeline
:
mockData
.
pipeline
,
ciStatus
:
'
success
'
,
ciStatus
:
'
success
'
,
hasCi
:
true
,
hasCi
:
true
,
troubleshootingDocsPath
:
'
help
'
,
});
});
expect
(
vm
.
hasPipeline
).
toEqual
(
true
);
expect
(
vm
.
hasPipeline
).
toEqual
(
true
);
...
@@ -30,6 +31,7 @@ describe('MRWidgetPipeline', () => {
...
@@ -30,6 +31,7 @@ describe('MRWidgetPipeline', () => {
it
(
'
should return false when there is no pipeline
'
,
()
=>
{
it
(
'
should return false when there is no pipeline
'
,
()
=>
{
vm
=
mountComponent
(
Component
,
{
vm
=
mountComponent
(
Component
,
{
pipeline
:
{},
pipeline
:
{},
troubleshootingDocsPath
:
'
help
'
,
});
});
expect
(
vm
.
hasPipeline
).
toEqual
(
false
);
expect
(
vm
.
hasPipeline
).
toEqual
(
false
);
...
@@ -42,6 +44,7 @@ describe('MRWidgetPipeline', () => {
...
@@ -42,6 +44,7 @@ describe('MRWidgetPipeline', () => {
pipeline
:
mockData
.
pipeline
,
pipeline
:
mockData
.
pipeline
,
hasCi
:
true
,
hasCi
:
true
,
ciStatus
:
'
success
'
,
ciStatus
:
'
success
'
,
troubleshootingDocsPath
:
'
help
'
,
});
});
expect
(
vm
.
hasCIError
).
toEqual
(
false
);
expect
(
vm
.
hasCIError
).
toEqual
(
false
);
...
@@ -52,6 +55,7 @@ describe('MRWidgetPipeline', () => {
...
@@ -52,6 +55,7 @@ describe('MRWidgetPipeline', () => {
pipeline
:
mockData
.
pipeline
,
pipeline
:
mockData
.
pipeline
,
hasCi
:
true
,
hasCi
:
true
,
ciStatus
:
null
,
ciStatus
:
null
,
troubleshootingDocsPath
:
'
help
'
,
});
});
expect
(
vm
.
hasCIError
).
toEqual
(
true
);
expect
(
vm
.
hasCIError
).
toEqual
(
true
);
...
@@ -65,11 +69,12 @@ describe('MRWidgetPipeline', () => {
...
@@ -65,11 +69,12 @@ describe('MRWidgetPipeline', () => {
pipeline
:
mockData
.
pipeline
,
pipeline
:
mockData
.
pipeline
,
hasCi
:
true
,
hasCi
:
true
,
ciStatus
:
null
,
ciStatus
:
null
,
troubleshootingDocsPath
:
'
help
'
,
});
});
expect
(
expect
(
vm
.
$el
.
querySelector
(
'
.media-body
'
).
textContent
.
trim
(),
vm
.
$el
.
querySelector
(
'
.media-body
'
).
textContent
.
trim
(),
).
to
Equal
(
'
Could not retrieve the pipeline status. For potential solutions please read the documentation.
'
);
).
to
Contain
(
'
Could not retrieve the pipeline status. For troubleshooting steps, read the <a href="help">documentation.</a>
'
);
});
});
describe
(
'
with a pipeline
'
,
()
=>
{
describe
(
'
with a pipeline
'
,
()
=>
{
...
@@ -78,6 +83,7 @@ describe('MRWidgetPipeline', () => {
...
@@ -78,6 +83,7 @@ describe('MRWidgetPipeline', () => {
pipeline
:
mockData
.
pipeline
,
pipeline
:
mockData
.
pipeline
,
hasCi
:
true
,
hasCi
:
true
,
ciStatus
:
'
success
'
,
ciStatus
:
'
success
'
,
troubleshootingDocsPath
:
'
help
'
,
});
});
});
});
...
@@ -122,6 +128,7 @@ describe('MRWidgetPipeline', () => {
...
@@ -122,6 +128,7 @@ describe('MRWidgetPipeline', () => {
pipeline
:
mockCopy
.
pipeline
,
pipeline
:
mockCopy
.
pipeline
,
hasCi
:
true
,
hasCi
:
true
,
ciStatus
:
'
success
'
,
ciStatus
:
'
success
'
,
troubleshootingDocsPath
:
'
help
'
,
});
});
});
});
...
@@ -162,6 +169,7 @@ describe('MRWidgetPipeline', () => {
...
@@ -162,6 +169,7 @@ describe('MRWidgetPipeline', () => {
pipeline
:
mockCopy
.
pipeline
,
pipeline
:
mockCopy
.
pipeline
,
hasCi
:
true
,
hasCi
:
true
,
ciStatus
:
'
success
'
,
ciStatus
:
'
success
'
,
troubleshootingDocsPath
:
'
help
'
,
});
});
expect
(
expect
(
...
@@ -179,6 +187,7 @@ describe('MRWidgetPipeline', () => {
...
@@ -179,6 +187,7 @@ describe('MRWidgetPipeline', () => {
pipeline
:
mockCopy
.
pipeline
,
pipeline
:
mockCopy
.
pipeline
,
hasCi
:
true
,
hasCi
:
true
,
ciStatus
:
'
success
'
,
ciStatus
:
'
success
'
,
troubleshootingDocsPath
:
'
help
'
,
});
});
expect
(
vm
.
$el
.
querySelector
(
'
.js-mini-pipeline-graph
'
)).
toEqual
(
null
);
expect
(
vm
.
$el
.
querySelector
(
'
.js-mini-pipeline-graph
'
)).
toEqual
(
null
);
...
...
This diff is collapsed.
Click to expand it.
spec/javascripts/vue_mr_widget/mock_data.js
View file @
95cbd41f
...
@@ -219,4 +219,5 @@ export default {
...
@@ -219,4 +219,5 @@ export default {
only_allow_merge_if_pipeline_succeeds
:
false
,
only_allow_merge_if_pipeline_succeeds
:
false
,
commit_change_content_path
:
'
/root/acets-app/merge_requests/22/commit_change_content
'
,
commit_change_content_path
:
'
/root/acets-app/merge_requests/22/commit_change_content
'
,
merge_commit_path
:
'
http://localhost:3000/root/acets-app/commit/53027d060246c8f47e4a9310fb332aa52f221775
'
,
merge_commit_path
:
'
http://localhost:3000/root/acets-app/commit/53027d060246c8f47e4a9310fb332aa52f221775
'
,
troubleshooting_docs_path
:
'
help
'
};
};
This diff is collapsed.
Click to expand it.
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