diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-02 18:14:49 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-02 18:14:49 +0400 |
| commit | c44c5f5faa39efdee1100eba88116c640e2f64ce (patch) | |
| tree | 894887bd7e81c79344f8795d7edbc7ead23e630b /config | |
| parent | b0439a78029df19b2f31c5a8c6c748bb356dd98a (diff) | |
| parent | c9dd2ca64bb9a2f4924b598d6b2288bdf3c43d27 (diff) | |
Merge branch 'broader-message-matching' of /home/git/repositories/gitlab/gitlabhq
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 7 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 0b1560ac587..28578eee50a 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -56,9 +56,10 @@ production: &base # signup_enabled: true ## Automatic issue closing - # If a commit message matches this regular express, all issues referenced from the matched text will be closed - # if it's pushed to a project's default branch. - # issue_closing_pattern: ^([Cc]loses|[Ff]ixes) +#\d+ + # If a commit message matches this regular expression, all issues referenced from the matched text will be closed. + # This happends when the commit is pushed or merged into the default branch of a project. + # When not specified the default issue_closing_pattern as specified below will be used. + # issue_closing_pattern: ([Cc]loses|[Ff]ixes) +#\d+ ## Default project features settings default_projects_features: diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 1c8758d9420..942b77ffd2e 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -69,7 +69,7 @@ rescue ArgumentError # no user configured end Settings.gitlab['signup_enabled'] ||= false Settings.gitlab['username_changing_enabled'] = true if Settings.gitlab['username_changing_enabled'].nil? -Settings.gitlab['issue_closing_pattern'] = '^([Cc]loses|[Ff]ixes) #(\d+)' if Settings.gitlab['issue_closing_pattern'].nil? +Settings.gitlab['issue_closing_pattern'] = '([Cc]loses|[Ff]ixes) #(\d+)' if Settings.gitlab['issue_closing_pattern'].nil? Settings.gitlab['default_projects_features'] ||= {} Settings.gitlab.default_projects_features['issues'] = true if Settings.gitlab.default_projects_features['issues'].nil? Settings.gitlab.default_projects_features['merge_requests'] = true if Settings.gitlab.default_projects_features['merge_requests'].nil? |