diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-06-24 15:39:45 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-06-24 15:39:45 +0000 |
| commit | 0372afe22ae6e48a85da37d02f6ba740f202b35d (patch) | |
| tree | 7ee948884d5d6f6ac23d847b8e3ab1bf7f28371a | |
| parent | 588244ddd8192512ce04be902226a2fb0b765215 (diff) | |
| parent | 69c70928c8b663e704fc9bdb21fd4094e3d27327 (diff) | |
| download | gitlab-ce-0372afe22ae6e48a85da37d02f6ba740f202b35d.tar.gz | |
Merge branch 'update-regexp-doc' into 'master'
Update default regexp documentation to match reality
The regexp was updated in 8172d2c1 but this was stale.
See merge request !4866
| -rw-r--r-- | doc/customization/issue_closing.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/customization/issue_closing.md b/doc/customization/issue_closing.md index 194b8e00299..4620bb2dcde 100644 --- a/doc/customization/issue_closing.md +++ b/doc/customization/issue_closing.md @@ -8,7 +8,7 @@ the matched text will be closed. This happens when the commit is pushed to a pro 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)?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?))+) +((?:[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+))+) ``` Here, `%{issue_ref}` is a complex regular expression defined inside GitLab, that matches a reference to a local issue (`#123`), cross-project issue (`group/project#123`) or a link to an issue (`https://gitlab.example.com/group/project/issues/123`). |