Merge branch 'build-notification-null-check' into 'master'

Stop CI notification showing when status is nil See merge request !10044

Merge branch 'build-notification-null-check' into 'master'
a8e94e24 · Jacob Schatz · DJ Mountney · 3c68d87f · a8e94e24
Commit a8e94e24 authored Mar 17, 2017 by Jacob Schatz Committed by DJ Mountney Mar 17, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

merge_request_widget.js app/assets/javascripts/merge_request_widget.js +1 -1

No files found.
--- 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;