diff options
| author | Douwe Maan <douwe@gitlab.com> | 2019-07-22 13:07:01 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2019-07-22 13:07:01 +0300 |
| commit | 65b16f9894c11c6c05762b04b2721bc26972e788 (patch) | |
| tree | 731a93ae4db0c28648a4a1ac2ca5b392c0cd0586 /app | |
| parent | b17e7e1b6f0ae9bfa4d18d2d010e3cf315ea9859 (diff) | |
| parent | b1694896ffd4dcf8bc54d19b5d513813e63d6121 (diff) | |
Merge branch '64697-markdown-issues-checkbox-inside-blockquote-status-won-t-be-saved' into 'master'
Markdown issues: Checkbox inside blockquote status won't be saved
See merge request gitlab-org/gitlab-ce!30952
Diffstat (limited to 'app')
| -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. |