diff options
| author | Marin Jankovski <marin@gitlab.com> | 2015-02-11 03:41:19 +0300 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2015-02-11 03:41:19 +0300 |
| commit | 653be1fe8afcadfa256f032da80c81b18debbc3b (patch) | |
| tree | d7178c804257b3911db11cd7518369f9a935b388 /config | |
| parent | a3681c0f98f9956722591389eae9d8b89a92470a (diff) | |
| parent | fd21d72b1b7042566b6deff184ddcc86cc4907f4 (diff) | |
Merge branch 'issue-closing-pattern' into 'master'
Extend issue clossing pattern
New: "Resolve", "Resolves", "Resolved", "Resolving" and "Close"
Now matches those supported by [GitHub](https://help.github.com/articles/closing-issues-via-commit-messages/), with the addition of the -ing forms.
See merge request !1475
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 4e015f1646b..d7c1a8428ac 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -114,7 +114,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)?) +(?:(?:issues? +)?#\d+(?:(?:, *| +and +)?))+)' 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)) +(?:(?:issues? +)?#\d+(?:(?:, *| +and +)?))+)' if Settings.gitlab['issue_closing_pattern'].nil? Settings.gitlab['default_projects_features'] ||= {} Settings.gitlab['webhook_timeout'] ||= 10 Settings.gitlab.default_projects_features['issues'] = true if Settings.gitlab.default_projects_features['issues'].nil? |