summaryrefslogtreecommitdiff
path: root/lib/api/helpers.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 /lib/api/helpers.rb
parentdeb62183edbd9111691f62a4f6a9febb1fcd79f7 (diff)
downloadgitlab-ce-f40716f48a25809d197ba2abf32ce150b7b73efa.tar.gz
No more and/or
Diffstat (limited to 'lib/api/helpers.rb')
-rw-r--r--lib/api/helpers.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb
index 7b6fae866eb..ae62f1f9580 100644
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
@@ -153,7 +153,7 @@ module API
params_hash = custom_params || params
attrs = {}
keys.each do |key|
- if params_hash[key].present? or (params_hash.has_key?(key) and params_hash[key] == false)
+ if params_hash[key].present? || (params_hash.has_key?(key) && params_hash[key] == false)
attrs[key] = params_hash[key]
end
end