Download as
Browse Code »

Commit c44c5f5faa39efdee1100eba88116c640e2f64ce

Authored by Dmitriy Zaporozhets
2 parents b0439a78 c9dd2ca6
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge branch 'broader-message-matching' of /home/git/repositories/gitlab/gitlabhq

Showing 2 changed files with 5 additions and 4 deletions   Show diff stats
config/gitlab.yml.example
  Diff comments   View file @c44c5f5
@@ -56,9 +56,10 @@ production: &base @@ -56,9 +56,10 @@ production: &base
56 # signup_enabled: true 56 # signup_enabled: true
57 57
58 ## Automatic issue closing 58 ## Automatic issue closing
59 - # If a commit message matches this regular express, all issues referenced from the matched text will be closed  
60 - # if it's pushed to a project's default branch.  
61 - # issue_closing_pattern: ^([Cc]loses|[Ff]ixes) +#\d+ 59 + # If a commit message matches this regular expression, all issues referenced from the matched text will be closed.
  60 + # This happends when the commit is pushed or merged into the default branch of a project.
  61 + # When not specified the default issue_closing_pattern as specified below will be used.
  62 + # issue_closing_pattern: ([Cc]loses|[Ff]ixes) +#\d+
62 63
63 ## Default project features settings 64 ## Default project features settings
64 default_projects_features: 65 default_projects_features:
config/initializers/1_settings.rb
  Diff comments   View file @c44c5f5
@@ -69,7 +69,7 @@ rescue ArgumentError # no user configured @@ -69,7 +69,7 @@ rescue ArgumentError # no user configured
69 end 69 end
70 Settings.gitlab['signup_enabled'] ||= false 70 Settings.gitlab['signup_enabled'] ||= false
71 Settings.gitlab['username_changing_enabled'] = true if Settings.gitlab['username_changing_enabled'].nil? 71 Settings.gitlab['username_changing_enabled'] = true if Settings.gitlab['username_changing_enabled'].nil?
72 -Settings.gitlab['issue_closing_pattern'] = '^([Cc]loses|[Ff]ixes) #(\d+)' if Settings.gitlab['issue_closing_pattern'].nil? 72 +Settings.gitlab['issue_closing_pattern'] = '([Cc]loses|[Ff]ixes) #(\d+)' if Settings.gitlab['issue_closing_pattern'].nil?
73 Settings.gitlab['default_projects_features'] ||= {} 73 Settings.gitlab['default_projects_features'] ||= {}
74 Settings.gitlab.default_projects_features['issues'] = true if Settings.gitlab.default_projects_features['issues'].nil? 74 Settings.gitlab.default_projects_features['issues'] = true if Settings.gitlab.default_projects_features['issues'].nil?
75 Settings.gitlab.default_projects_features['merge_requests'] = true if Settings.gitlab.default_projects_features['merge_requests'].nil? 75 Settings.gitlab.default_projects_features['merge_requests'] = true if Settings.gitlab.default_projects_features['merge_requests'].nil?