diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-16 09:10:09 +0000 |
---|---|---|
committer | Winnie Hellmann <winnie@gitlab.com> | 2017-10-18 09:13:29 +0000 |
commit | 6526efa657e874e286c851f3890ed775c330ab74 (patch) | |
tree | b7745118e06959ff7c28a01f3fae413426f00640 /doc | |
parent | 4c552a52260d2192a3bb654a0a83d8aea9551d07 (diff) | |
download | gitlab-ce-6526efa657e874e286c851f3890ed775c330ab74.tar.gz |
Merge branch 'implements-closing-docs' into 'master'
Docs for Add "implements" to the default issue closing message regex
See merge request gitlab-org/gitlab-ce!14880
(cherry picked from commit fde837d53120a24b2ba512327185f0705e56c9c6)
82f9e809 Update automatic_issue_closing.md
Diffstat (limited to 'doc')
-rw-r--r-- | doc/user/project/issues/automatic_issue_closing.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/user/project/issues/automatic_issue_closing.md b/doc/user/project/issues/automatic_issue_closing.md index d6f3a7d5555..10dede255ec 100644 --- a/doc/user/project/issues/automatic_issue_closing.md +++ b/doc/user/project/issues/automatic_issue_closing.md @@ -19,7 +19,7 @@ When not specified, the default issue closing pattern as shown below will be used: ```bash -((?:[Cc]los(?:e[sd]?|ing)|[Ff]ix(?:e[sd]|ing)?|[Rr]esolv(?:e[sd]?|ing))(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+) +((?:[Cc]los(?:e[sd]?|ing)|[Ff]ix(?:e[sd]|ing)?|[Rr]esolv(?:e[sd]?|ing)|[Ii]mplement(?:s|ed|ing)?)(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+) ``` Note that `%{issue_ref}` is a complex regular expression defined inside GitLab's @@ -34,6 +34,7 @@ This translates to the following keywords: - Close, Closes, Closed, Closing, close, closes, closed, closing - Fix, Fixes, Fixed, Fixing, fix, fixes, fixed, fixing - Resolve, Resolves, Resolved, Resolving, resolve, resolves, resolved, resolving +- Implement, Implements, Implemented, Implementing, implement, implements, implemented, implementing --- |