diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2018-10-23 15:03:10 +0200 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2018-10-24 20:16:14 +0200 |
| commit | 9f0dbf8a44cf8322edd5097f37b30853d78c4d79 (patch) | |
| tree | 7d2513e33dbc1207355e003109a2f7245e9c0632 | |
| parent | f8f1466ad07b3dcea7c0abc54fa25865b420b4f0 (diff) | |
| download | gitlab-ce-9f0dbf8a44cf8322edd5097f37b30853d78c4d79.tar.gz | |
Change CI status error message
4 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue index fee41b239e8..718fd3507b2 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue @@ -78,7 +78,7 @@ export default { /> </div> <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> </template> <template v-else-if="hasPipeline"> diff --git a/spec/features/merge_request/user_sees_merge_widget_spec.rb b/spec/features/merge_request/user_sees_merge_widget_spec.rb index f15129759de..6ad97e6912b 100644 --- a/spec/features/merge_request/user_sees_merge_widget_spec.rb +++ b/spec/features/merge_request/user_sees_merge_widget_spec.rb @@ -174,7 +174,7 @@ describe 'Merge request > User sees merge widget', :js do # Wait for the `ci_status` and `merge_check` 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 diff --git a/spec/features/merge_request/user_sees_pipelines_spec.rb b/spec/features/merge_request/user_sees_pipelines_spec.rb index 45cccbee63e..1ab07e8e0db 100644 --- a/spec/features/merge_request/user_sees_pipelines_spec.rb +++ b/spec/features/merge_request/user_sees_pipelines_spec.rb @@ -42,7 +42,7 @@ describe 'Merge request > User sees pipelines', :js do wait_for_requests 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 diff --git a/spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js b/spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js index ea8007d2029..d78e9e4a19f 100644 --- a/spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js +++ b/spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js @@ -69,7 +69,7 @@ describe('MRWidgetPipeline', () => { expect( 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', () => { |