diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-03-17 15:10:35 +0000 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2017-03-17 11:19:49 -0700 |
| commit | a8e94e240e5a79fd2543813ec594fd8f8e4ca42f (patch) | |
| tree | 871b8ace8c0c8644e90b17a4d0c8c996b59e4a07 | |
| parent | 3c68d87fe622083c2efeab27a3d5f5d4a0fddf1b (diff) | |
| download | gitlab-ce-a8e94e240e5a79fd2543813ec594fd8f8e4ca42f.tar.gz | |
Merge branch 'build-notification-null-check' into 'master'
Stop CI notification showing when status is nil
See merge request !10044
| -rw-r--r-- | app/assets/javascripts/merge_request_widget.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_request_widget.js b/app/assets/javascripts/merge_request_widget.js index 5f1bd474a0c..80db9b37862 100644 --- a/app/assets/javascripts/merge_request_widget.js +++ b/app/assets/javascripts/merge_request_widget.js @@ -175,7 +175,7 @@ require('./smart_interval'); _this.opts.ci_sha = data.sha; _this.updateCommitUrls(data.sha); } - if (showNotification) { + if (showNotification && data.status) { status = _this.ciLabelForStatus(data.status); if (status === "preparing") { title = _this.opts.ci_title.preparing; |