summaryrefslogtreecommitdiff
path: root/app/models/project_services/drone_ci_service.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-02-21 16:31:14 -0600
committerDouwe Maan <douwe@selenight.nl>2017-02-21 16:31:14 -0600
commitf40716f48a25809d197ba2abf32ce150b7b73efa (patch)
tree3356ea055ddee37517467c1f0ed4f4b98f655e6f /app/models/project_services/drone_ci_service.rb
parentdeb62183edbd9111691f62a4f6a9febb1fcd79f7 (diff)
downloadgitlab-ce-f40716f48a25809d197ba2abf32ce150b7b73efa.tar.gz
No more and/or
Diffstat (limited to 'app/models/project_services/drone_ci_service.rb')
-rw-r--r--app/models/project_services/drone_ci_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project_services/drone_ci_service.rb b/app/models/project_services/drone_ci_service.rb
index 942ec9371e5..1ad9efac196 100644
--- a/app/models/project_services/drone_ci_service.rb
+++ b/app/models/project_services/drone_ci_service.rb
@@ -52,7 +52,7 @@ class DroneCiService < CiService
response = HTTParty.get(commit_status_path(sha, ref), verify: enable_ssl_verification)
status =
- if response.code == 200 and response['status']
+ if response.code == 200 && response['status']
case response['status']
when 'killed'
:canceled