diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-17 15:01:20 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-17 15:01:20 +0000 |
| commit | 546fa165ff728bc2d25ed9b55b95dd1d48139d4a (patch) | |
| tree | 612a9800dba636c8053706363675bbac2c91c626 /lib | |
| parent | e47989a58b8a9f83855ea9210ba5786fc14fb841 (diff) | |
| parent | 170efaaba273792ddffc2806ef1501f33d87a5a2 (diff) | |
| download | gitlab-ce-546fa165ff728bc2d25ed9b55b95dd1d48139d4a.tar.gz | |
Merge branch '25741_enable_multiline_operation_indentation_rubocop_rule' into 'master'
Enable Style/MultilineOperationIndentation in Rubocop
Fixes #25741
See merge request !8125
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/email/reply_parser.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/email/reply_parser.rb b/lib/gitlab/email/reply_parser.rb index 85402c2a278..f586c5ab062 100644 --- a/lib/gitlab/email/reply_parser.rb +++ b/lib/gitlab/email/reply_parser.rb @@ -69,7 +69,7 @@ module Gitlab # This one might be controversial but so many reply lines have years, times and end with a colon. # Let's try it and see how well it works. break if (l =~ /\d{4}/ && l =~ /\d:\d\d/ && l =~ /\:$/) || - (l =~ /On \w+ \d+,? \d+,?.*wrote:/) + (l =~ /On \w+ \d+,? \d+,?.*wrote:/) # Headers on subsequent lines break if (0..2).all? { |off| lines[idx + off] =~ REPLYING_HEADER_REGEX } |