summaryrefslogtreecommitdiff
path: root/rubocop
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-03 18:06:11 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-03 18:06:11 +0000
commit25521def84a6987fe9d4265b560e930bfb32c195 (patch)
tree711e001ea65f76a9c2eb034c4531bda325af84f3 /rubocop
parent9a1c5456747a7b5b218b8b44e4b43396bf7fd705 (diff)
downloadgitlab-ce-25521def84a6987fe9d4265b560e930bfb32c195.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'rubocop')
-rw-r--r--rubocop/cop/line_break_around_conditional_block.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/rubocop/cop/line_break_around_conditional_block.rb b/rubocop/cop/line_break_around_conditional_block.rb
index 8118b314b63..2523cc162f3 100644
--- a/rubocop/cop/line_break_around_conditional_block.rb
+++ b/rubocop/cop/line_break_around_conditional_block.rb
@@ -117,7 +117,7 @@ module RuboCop
end
def block_start?(line)
- line.match(/ (do|{)( \|.*?\|)?\s?$/)
+ line.match(/ (do|{)( \|.*?\|)?\s?(#.+)?\z/)
end
def end_line?(line)