Commit ea7efee7 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'allow-one-more-blank-line' into 'master'

Allow one more line difference for EE specific lines

See merge request gitlab-org/gitlab-ee!5965
parents 75d60496 2f418b0a
......@@ -18,9 +18,9 @@ offenses = updated_numstat.select do |file, updated_delta|
updated_delta > current_delta &&
WHITELIST.all? { |pattern| !Dir.glob(pattern).include?(file) }
# Don't complain if we're just adding one more line, which could be
# `prepend EE::Module` that we want.
more_lines && !(current_delta == 0 && updated_delta == 1)
# Don't complain if we're just adding 1 or 2 more lines, which could be
# `prepend EE::Module` and a blank line that we want.
more_lines && !(current_delta == 0 && updated_delta <= 2)
end
if offenses.empty?
......
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