Commit de900262 authored by GitLab Bot's avatar GitLab Bot

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-19

parents 640ccda5 3f51ec21
......@@ -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
......
......@@ -11,7 +11,7 @@ module Boards
private
def can_create_board?
parent.boards.size == 0
parent.boards.empty?
end
def create_board!
......
......@@ -38,6 +38,10 @@ def fail_commit(commit, message)
fail("#{commit.sha}: #{message}")
end
def warn_commit(commit, message)
warn("#{commit.sha}: #{message}")
end
def lines_changed_in_commit(commit)
commit.diff_parent.stats[:total][:lines]
end
......@@ -87,13 +91,21 @@ def lint_commits(commits)
failures = true
end
if subject.length > 50
if subject.length > 72
fail_commit(
commit,
'The commit subject may not be longer than 50 characters'
'The commit subject may not be longer than 72 characters'
)
failures = true
elsif subject.length > 50
warn_commit(
commit,
"This commit's subject line could be improved. " \
'Commit subjects are ideally no longer than roughly 50 characters, ' \
'though we allow up to 72 characters in the subject. ' \
'If possible, try to reduce the length of the subject to roughly 50 characters.'
)
end
unless subject_starts_with_capital?(subject)
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment