diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-03-17 18:10:35 +0300 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-03-17 18:10:35 +0300 |
| commit | 2b2ce1b2313d1226735f05e6afa2d23da8f72921 (patch) | |
| tree | da10be387f6d62faf3fe1c75e9bc666115b706c5 /app/assets | |
| parent | 7add0e8564cde896339a72250a3636eb05271a7d (diff) | |
| parent | d6c4453a923cf65b860945a46abf6ee92ba57c9a (diff) | |
Merge branch 'build-notification-null-check' into 'master'
Stop CI notification showing when status is nil
See merge request !10044
Diffstat (limited to 'app/assets')
| -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 66cc270ab4d..94a4f24f1d7 100644 --- a/app/assets/javascripts/merge_request_widget.js +++ b/app/assets/javascripts/merge_request_widget.js @@ -176,7 +176,7 @@ import MiniPipelineGraph from './mini_pipeline_graph_dropdown'; _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; |