diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-01-27 19:33:58 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-01-27 19:33:58 -0600 |
| commit | 69e4072f89ad9aeebcc852373341f790c1b021e2 (patch) | |
| tree | c68ad1ee38efe48707e8ea467db3e2759f1a88c0 /app/models/concerns/taskable.rb | |
| parent | c5b7cc54e9bfceda7d48b1f15bcf064a0d96c07d (diff) | |
| parent | 6ccc4eb42a05d4ce8b75773723305bd82305dfec (diff) | |
| download | gitlab-ce-69e4072f89ad9aeebcc852373341f790c1b021e2.tar.gz | |
Merge branch 'master' into go-go-gadget-webpack
* master: (389 commits)
Document "No gems fetched from git repositories" policy [ci skip]
Typos
Small gramatical tweaks
Typos
Added PHP & NPM doc
Use `:empty_project` where possible in request specs
Add caching of droplab ajax requests
Use `:empty_project` where possible in model specs
Revert 3f17f29a
Remove unused js response from refs controller
Add MR id to changelog entry
fixed small mini pipeline graph line glitch
Prevent form to be submitted twice
Fix Error 500 when repositories contain annotated tags pointing to blobs
Fix /explore sorting (trending)
Simplify wording in "adding an image" docs
Remove "official merge window" from CONTRIBUTING.md [ci skip]
Update repository check documentation
Fixed flexbox and wrap issues
Update two_factor_authentication.md
...
Diffstat (limited to 'app/models/concerns/taskable.rb')
| -rw-r--r-- | app/models/concerns/taskable.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/concerns/taskable.rb b/app/models/concerns/taskable.rb index ebc75100a54..25e2d8ea24e 100644 --- a/app/models/concerns/taskable.rb +++ b/app/models/concerns/taskable.rb @@ -11,10 +11,10 @@ module Taskable INCOMPLETE = 'incomplete'.freeze ITEM_PATTERN = / ^ - (?:\s*[-+*]|(?:\d+\.))? # optional list prefix - \s* # optional whitespace prefix - (\[\s\]|\[[xX]\]) # checkbox - (\s.+) # followed by whitespace and some text. + \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. /x def self.get_tasks(content) |