Merge branch 'fix-rubocop-todo' into 'master'
Fix rubocop Style/ZeroLengthPredicate See merge request gitlab-org/gitlab-ce!21793
This commit is contained in:
commit
3f51ec2124
7 changed files with 7 additions and 21 deletions
|
@ -808,20 +808,6 @@ Style/UnlessElse:
|
|||
Style/UnneededInterpolation:
|
||||
Enabled: false
|
||||
|
||||
# Offense count: 11
|
||||
# Cop supports --auto-correct.
|
||||
Style/ZeroLengthPredicate:
|
||||
Exclude:
|
||||
- 'app/models/deploy_key.rb'
|
||||
- 'app/models/network/commit.rb'
|
||||
- 'app/models/network/graph.rb'
|
||||
- 'app/models/project_services/asana_service.rb'
|
||||
- 'app/services/boards/create_service.rb'
|
||||
- 'app/services/merge_requests/conflicts/list_service.rb'
|
||||
- 'lib/declarative_policy/dsl.rb'
|
||||
- 'lib/extracts_path.rb'
|
||||
- 'lib/gitlab/git/repository.rb'
|
||||
|
||||
# Offense count: 22840
|
||||
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
|
||||
# URISchemes: http, https
|
||||
|
|
|
@ -18,7 +18,7 @@ class DeployKey < Key
|
|||
end
|
||||
|
||||
def orphaned?
|
||||
self.deploy_keys_projects.length == 0
|
||||
self.deploy_keys_projects.empty?
|
||||
end
|
||||
|
||||
def almost_orphaned?
|
||||
|
|
|
@ -18,7 +18,7 @@ module Network
|
|||
end
|
||||
|
||||
def space
|
||||
if @spaces.size > 0
|
||||
if @spaces.present?
|
||||
@spaces.first
|
||||
else
|
||||
0
|
||||
|
|
|
@ -81,7 +81,7 @@ module Network
|
|||
skip = 0
|
||||
while offset == -1
|
||||
tmp_commits = find_commits(skip)
|
||||
if tmp_commits.size > 0
|
||||
if tmp_commits.present?
|
||||
index = tmp_commits.index do |c|
|
||||
c.id == @commit.id
|
||||
end
|
||||
|
@ -218,7 +218,7 @@ module Network
|
|||
def get_space_base(leaves)
|
||||
space_base = 1
|
||||
parents = leaves.last.parents(@map)
|
||||
if parents.size > 0
|
||||
if parents.present?
|
||||
if parents.first.space > 0
|
||||
space_base = parents.first.space
|
||||
end
|
||||
|
|
|
@ -65,7 +65,7 @@ http://app.asana.com/-/account_api'
|
|||
# check the branch restriction is poplulated and branch is not included
|
||||
branch = Gitlab::Git.ref_name(data[:ref])
|
||||
branch_restriction = restrict_to_branch.to_s
|
||||
if branch_restriction.length > 0 && branch_restriction.index(branch).nil?
|
||||
if branch_restriction.present? && branch_restriction.index(branch).nil?
|
||||
return
|
||||
end
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@ module Boards
|
|||
private
|
||||
|
||||
def can_create_board?
|
||||
parent.boards.size == 0
|
||||
parent.boards.empty?
|
||||
end
|
||||
|
||||
def create_board!
|
||||
|
|
|
@ -54,7 +54,7 @@ module ExtractsPath
|
|||
|
||||
valid_refs = ref_names.select { |v| id.start_with?("#{v}/") }
|
||||
|
||||
if valid_refs.length == 0
|
||||
if valid_refs.empty?
|
||||
# No exact ref match, so just try our best
|
||||
pair = id.match(%r{([^/]+)(.*)}).captures
|
||||
else
|
||||
|
|
Loading…
Reference in a new issue