Skip to content

G
gitlab-ce
Commit 6a13b372 authored by Phil Hughes's avatar Phil Hughes
Browse files
Options

Fixed missed conflict

parent 843bc44a
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
app/assets/javascripts/merge_request_widget.js.coffee
View file @ 6a13b372
...@@ -72,15 +72,11 @@ class @MergeRequestWidget ...@@ -72,15 +72,11 @@ class @MergeRequestWidget
@firstCICheck = false @firstCICheck = false
@opts.ci_status = data.status @opts.ci_status = data.status
<<<<<<< a918e8bf277418048776a5d9c34a64b39f4e56f3
if @opts.ci_status is '' if @opts.ci_status is ''
@opts.ci_status = data.status @opts.ci_status = data.status
return return
if data.status isnt @opts.ci_status
=======
if data.status isnt @opts.ci_status and data.status? if data.status isnt @opts.ci_status and data.status?
>>>>>>> Build notification null check
@showCIStatus data.status @showCIStatus data.status
if data.coverage if data.coverage
@showCICoverage data.coverage @showCICoverage data.coverage
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7