diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-07-16 14:46:39 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-07-16 14:46:39 +0000 |
| commit | a73f480715f086e86d781e22d8a76b71c3b0680a (patch) | |
| tree | 2388a3f85355ca180d2256f9c9299b5bf2dda059 /config | |
| parent | 9f524bbe534208f552b6689ecc103ae7094e99b8 (diff) | |
| parent | 69f9c9116141f291e90374ffa5959a8881c950e1 (diff) | |
| download | gitlab-ce-a73f480715f086e86d781e22d8a76b71c3b0680a.tar.gz | |
Merge branch 'update-issue-closing-pattern' into 'master'
Update issue closing pattern
Closes #49166
See merge request gitlab-org/gitlab-ce!20554
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/1_settings.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 693a2934a1b..4b9cc59ec45 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -135,7 +135,7 @@ Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled']. Settings.gitlab['signin_enabled'] ||= true if Settings.gitlab['signin_enabled'].nil? Settings.gitlab['restricted_visibility_levels'] = Settings.__send__(:verify_constant_array, Gitlab::VisibilityLevel, Settings.gitlab['restricted_visibility_levels'], []) Settings.gitlab['username_changing_enabled'] = true if Settings.gitlab['username_changing_enabled'].nil? -Settings.gitlab['issue_closing_pattern'] = '((?:[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+))+)' if Settings.gitlab['issue_closing_pattern'].nil? +Settings.gitlab['issue_closing_pattern'] = '((?:[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+))+)' if Settings.gitlab['issue_closing_pattern'].nil? Settings.gitlab['default_projects_features'] ||= {} Settings.gitlab['webhook_timeout'] ||= 10 Settings.gitlab['max_attachment_size'] ||= 10 |