Commit e9802a83 authored by Fatih Acet's avatar Fatih Acet

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

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
parents 75245f34 4e732dec
...@@ -152,6 +152,7 @@ export default { ...@@ -152,6 +152,7 @@ export default {
}, },
handleNotification(data) { handleNotification(data) {
if (data.ci_status === this.mr.ciStatus) return; if (data.ci_status === this.mr.ciStatus) return;
if (!data.pipeline) return;
const label = data.pipeline.details.status.label; const label = data.pipeline.details.status.label;
const title = `Pipeline ${label}`; const title = `Pipeline ${label}`;
......
---
title: Prevent MR Widget error when no CI configured
merge_request:
author:
type: fixed
...@@ -295,6 +295,15 @@ describe('mrWidgetOptions', () => { ...@@ -295,6 +295,15 @@ describe('mrWidgetOptions', () => {
expect(notify.notifyMe).not.toHaveBeenCalled(); 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', () => { describe('resumePolling', () => {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment