kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '34130-null-pipes' into 'master'

Browse source 
Resolve "Merge request says "Could not connect to the CI server", no CI or integration is configured"

See merge request gitlab-org/gitlab-ce!17053
This commit is contained in:
Fatih Acet 2018-02-15 08:15:23 +00:00
commit e9802a833c
3 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
View file

@ -152,6 +152,7 @@ export default {
},
handleNotification(data) {
if (data.ci_status === this.mr.ciStatus) return;
if (!data.pipeline) return;
const label = data.pipeline.details.status.label;
const title = `Pipeline ${label}`;

5
changelogs/unreleased/34130-null-pipes.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Prevent MR Widget error when no CI configured
merge_request:
author:
type: fixed

9
spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
View file

@ -295,6 +295,15 @@ describe('mrWidgetOptions', () => {
expect(notify.notifyMe).not.toHaveBeenCalled();
});
it('should not notify if no pipeline provided', () => {
vm.handleNotification({
...data,
pipeline: undefined,
});
expect(notify.notifyMe).not.toHaveBeenCalled();
});
});
describe('resumePolling', () => {