summaryrefslogtreecommitdiff
path: root/rubocop
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-05-28 15:00:09 +0200
committerRémy Coutable <remy@rymai.me>2018-05-29 10:38:59 +0200
commit1c5106fadfe59ec4af7235b94d424e4367185c2e (patch)
tree1cbbf310f20cb21ebb2b74d200c2333d3d7c1312 /rubocop
parent2b8eb7273efee84180b322a0aac33e1f4ee30d2c (diff)
downloadgitlab-ce-1c5106fadfe59ec4af7235b94d424e4367185c2e.tar.gz
Allow comment after if/unless clause46758-fallout-of-cacheable-attribute
Signed-off-by: Rémy Coutable <remy@rymai.me>
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 3e7021e724e..8b6052fee1b 100644
--- a/rubocop/cop/line_break_around_conditional_block.rb
+++ b/rubocop/cop/line_break_around_conditional_block.rb
@@ -95,7 +95,7 @@ module RuboCop
end
def end_clause_line?(line)
- line =~ /^\s*(rescue|else|elsif|when)/
+ line =~ /^\s*(#|rescue|else|elsif|when)/
end
def begin_line?(line)