diff options
| author | George Tsiolis <tsiolis.g@gmail.com> | 2018-07-11 16:03:02 +0300 |
|---|---|---|
| committer | George Tsiolis <tsiolis.g@gmail.com> | 2018-07-11 16:06:14 +0300 |
| commit | 3d1a23162ae14e0b5ccf7b42c6bac13adfda1e4e (patch) | |
| tree | 07a0dced688a24a2f6c7d91ee099ae44acd976f4 | |
| parent | f3edbafe6310ca1584002b8a351048a3fb3309e3 (diff) | |
| download | gitlab-ce-3d1a23162ae14e0b5ccf7b42c6bac13adfda1e4e.tar.gz | |
Update issue closing pattern
| -rw-r--r-- | changelogs/unreleased/update-issue-closing-pattern.yml | 5 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/update-issue-closing-pattern.yml b/changelogs/unreleased/update-issue-closing-pattern.yml new file mode 100644 index 00000000000..95488adf449 --- /dev/null +++ b/changelogs/unreleased/update-issue-closing-pattern.yml @@ -0,0 +1,5 @@ +--- +title: Update issue closing pattern +merge_request: 20554 +author: George Tsiolis +type: changed 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 |