diff options
| author | Phil Hughes <me@iamphill.com> | 2016-04-07 15:32:46 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-04-11 17:20:47 +0100 |
| commit | 6a13b372224a5f7ae03dde92f455645441b62f84 (patch) | |
| tree | 85ce97eaba1a4dafa443f8a7ee05d3130abaf194 | |
| parent | 843bc44aa9dea8a19af21dd13a82ecc02bf8840c (diff) | |
| download | gitlab-ce-6a13b372224a5f7ae03dde92f455645441b62f84.tar.gz | |
Fixed missed conflict
| -rw-r--r-- | app/assets/javascripts/merge_request_widget.js.coffee | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee index a522f9189ab..065626beeb8 100644 --- a/app/assets/javascripts/merge_request_widget.js.coffee +++ b/app/assets/javascripts/merge_request_widget.js.coffee @@ -72,15 +72,11 @@ class @MergeRequestWidget @firstCICheck = false @opts.ci_status = data.status -<<<<<<< a918e8bf277418048776a5d9c34a64b39f4e56f3 if @opts.ci_status is '' @opts.ci_status = data.status return - if data.status isnt @opts.ci_status -======= if data.status isnt @opts.ci_status and data.status? ->>>>>>> Build notification null check @showCIStatus data.status if data.coverage @showCICoverage data.coverage |