Merge branch 'rubocop/enable-negatedif-style-cop' into 'master'

Enable Style/NegatedIf Rubocop cop

Favor `unless` over `if` for negative conditions (or control flow ||).

```ruby
# bad
do_something if !some_condition
# bad
do_something if not some_condition

# good
do_something unless some_condition
# good
some_condition || do_something
```

See #17478

See merge request !4355
This commit is contained in:
Robert Speicher 2016-05-30 17:59:10 +00:00
commit e7586cfbdc
6 changed files with 6 additions and 6 deletions

View File

@ -394,7 +394,7 @@ Style/MutableConstant:
# Favor unless over if for negative conditions (or control flow or).
Style/NegatedIf:
Enabled: false
Enabled: true
# Favor until over while for negative conditions.
Style/NegatedWhile:

View File

@ -60,7 +60,7 @@ module Ci
end
def display_name
return short_sha unless !description.blank?
return short_sha if description.blank?
description
end

View File

@ -23,7 +23,7 @@ class GitTagPushService < BaseService
commits = []
message = nil
if !Gitlab::Git.blank_ref?(params[:newrev])
unless Gitlab::Git.blank_ref?(params[:newrev])
tag_name = Gitlab::Git.ref_name(params[:ref])
tag = project.repository.find_tag(tag_name)
if tag && tag.target == params[:newrev]

View File

@ -22,7 +22,7 @@ module Projects
end
def execute
raise LeaseTaken if !try_obtain_lease
raise LeaseTaken unless try_obtain_lease
GitlabShellOneShotWorker.perform_async(:gc, @project.path_with_namespace)
ensure

View File

@ -52,7 +52,7 @@ class Settings < Settingslogic
# check that values in `current` (string or integer) is a contant in `modul`.
def verify_constant_array(modul, current, default)
values = default || []
if !current.nil?
unless current.nil?
values = []
current.each do |constant|
values.push(verify_constant(modul, constant, nil))

View File

@ -265,7 +265,7 @@ module Ci
end
def validate_job_dependencies!(name, job)
if !validate_array_of_strings(job[:dependencies])
unless validate_array_of_strings(job[:dependencies])
raise ValidationError, "#{name} job: dependencies parameter should be an array of strings"
end