diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-02-22 00:03:29 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-02-22 00:03:29 +0000 |
| commit | 4f6e067eca744b74e5f4b03ce23411976dbc7cce (patch) | |
| tree | 62b19572dc7c60d1c5648ce452e499bf4e37f7ce /lib/api | |
| parent | 7c617fccb4615b9aff35cc7d09aea809381165ee (diff) | |
| parent | f40716f48a25809d197ba2abf32ce150b7b73efa (diff) | |
| download | gitlab-ce-4f6e067eca744b74e5f4b03ce23411976dbc7cce.tar.gz | |
Merge branch 'dm-no-more-andor' into 'master'
No more and/or
See merge request !9428
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/helpers.rb | 2 |
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 |