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
9f0dbf8a
Commit
9f0dbf8a
authored
Oct 23, 2018
by
Matija Čupić
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change CI status error message
parent
f8f1466a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
...ue_merge_request_widget/components/mr_widget_pipeline.vue
+1
-1
spec/features/merge_request/user_sees_merge_widget_spec.rb
spec/features/merge_request/user_sees_merge_widget_spec.rb
+1
-1
spec/features/merge_request/user_sees_pipelines_spec.rb
spec/features/merge_request/user_sees_pipelines_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
+1
-1
No files found.
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
View file @
9f0dbf8a
...
@@ -78,7 +78,7 @@ export default {
...
@@ -78,7 +78,7 @@ export default {
/>
/>
</div>
</div>
<div
class=
"media-body"
>
<div
class=
"media-body"
>
Could not
connect to the CI server. Please check your settings and try again
Could not
retrieve the pipeline status. For potential solutions please read the
<a
href=
"#"
>
documentation
</a>
.
</div>
</div>
</
template
>
</
template
>
<
template
v-else-if=
"hasPipeline"
>
<
template
v-else-if=
"hasPipeline"
>
...
...
spec/features/merge_request/user_sees_merge_widget_spec.rb
View file @
9f0dbf8a
...
@@ -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
connect to the CI server. Please check your settings and try again
'
)
expect
(
page
).
to
have_text
(
'Could not
retrieve the pipeline status. For potential solutions please read the documentation.
'
)
end
end
end
end
...
...
spec/features/merge_request/user_sees_pipelines_spec.rb
View file @
9f0dbf8a
...
@@ -42,7 +42,7 @@ describe 'Merge request > User sees pipelines', :js do
...
@@ -42,7 +42,7 @@ describe 'Merge request > User sees pipelines', :js do
wait_for_requests
wait_for_requests
expect
(
page
.
find
(
'.ci-widget'
)).
to
have_content
(
expect
(
page
.
find
(
'.ci-widget'
)).
to
have_content
(
'Could not
connect to the CI server. Please check your settings and try again
'
)
'Could not
retrieve the pipeline status. For potential solutions please read the documentation.
'
)
end
end
end
end
...
...
spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js
View file @
9f0dbf8a
...
@@ -69,7 +69,7 @@ describe('MRWidgetPipeline', () => {
...
@@ -69,7 +69,7 @@ describe('MRWidgetPipeline', () => {
expect
(
expect
(
vm
.
$el
.
querySelector
(
'
.media-body
'
).
textContent
.
trim
(),
vm
.
$el
.
querySelector
(
'
.media-body
'
).
textContent
.
trim
(),
).
toEqual
(
'
Could not
connect to the CI server. Please check your settings and try again
'
);
).
toEqual
(
'
Could not
retrieve the pipeline status. For potential solutions please read the documentation.
'
);
});
});
describe
(
'
with a pipeline
'
,
()
=>
{
describe
(
'
with a pipeline
'
,
()
=>
{
...
...
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