diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-03-29 13:59:37 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-03-29 13:59:37 +0000 |
| commit | 45b6118169b4f09f71abc3b1a6a0c8427c568d9c (patch) | |
| tree | 80e3ecb57dd165b4cd9728cc1a30aba6295eb9e6 | |
| parent | 66bb33542c96d35197b4dc9627a06e16fef28476 (diff) | |
| parent | 905c772a6ab6fbb1a2fa0845f4c5d2a928c1a6c9 (diff) | |
| download | gitlab-ce-45b6118169b4f09f71abc3b1a6a0c8427c568d9c.tar.gz | |
Merge branch 'fix-issue-closing-pattern-docs' into 'master'
Fix typo in issue closing pattern docs
Closes omnibus-gitlab#3351
See merge request gitlab-org/gitlab-ce!18080
| -rw-r--r-- | doc/administration/issue_closing_pattern.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/administration/issue_closing_pattern.md b/doc/administration/issue_closing_pattern.md index 28e1fd4e12e..466bb1f851e 100644 --- a/doc/administration/issue_closing_pattern.md +++ b/doc/administration/issue_closing_pattern.md @@ -24,11 +24,11 @@ Because Rubular doesn't understand `%{issue_ref}`, you can replace this by **For Omnibus installations** 1. Open `/etc/gitlab/gitlab.rb` with your editor. -1. Change the value of `gitlab_rails['issue_closing_pattern']` to a regular +1. Change the value of `gitlab_rails['gitlab_issue_closing_pattern']` to a regular expression of your liking: ```ruby - gitlab_rails['issue_closing_pattern'] = "((?:[Cc]los(?:e[sd]|ing)|[Ff]ix(?:e[sd]|ing)?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?))+)" + gitlab_rails['gitlab_issue_closing_pattern'] = "((?:[Cc]los(?:e[sd]|ing)|[Ff]ix(?:e[sd]|ing)?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?))+)" ``` 1. [Reconfigure] GitLab for the changes to take effect. |