diff options
| author | Igor <idrozdov@gitlab.com> | 2019-08-05 15:06:02 +0000 |
|---|---|---|
| committer | Igor <idrozdov@gitlab.com> | 2019-08-05 15:06:02 +0000 |
| commit | 7efb062c3c3c7b44113d0dc0fe78fc9b8e95bd7c (patch) | |
| tree | a12bde9bbeffcc0c365d3a29339d0389dcefdd8f /app/models/concerns/taskable.rb | |
| parent | 2bd1320f86b8cfd5d60199c5f7f0caa1cc2aa66b (diff) | |
| parent | 3dfc89ade452ad7f0185653b30ed1d4bb2544fb0 (diff) | |
| download | gitlab-ce-id-test-codeowners.tar.gz | |
Merge branch 'master' into 'id-test-codeowners'id-test-codeowners
# Conflicts:
# .gitlab/CODEOWNERS
Diffstat (limited to 'app/models/concerns/taskable.rb')
| -rw-r--r-- | app/models/concerns/taskable.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/concerns/taskable.rb b/app/models/concerns/taskable.rb index b42adad94ba..8b536a123fc 100644 --- a/app/models/concerns/taskable.rb +++ b/app/models/concerns/taskable.rb @@ -15,7 +15,8 @@ module Taskable INCOMPLETE_PATTERN = /(\[[\s]\])/.freeze ITEM_PATTERN = %r{ ^ - \s*(?:[-+*]|(?:\d+\.)) # list prefix required - task item has to be always in a list + (?:(?:>\s{0,4})*) # optional blockquote characters + \s*(?:[-+*]|(?:\d+\.)) # list prefix required - task item has to be always in a list \s+ # whitespace prefix has to be always presented for a list item (\[\s\]|\[[xX]\]) # checkbox (\s.+) # followed by whitespace and some text. |