Merge branch 'broader-message-matching' of /home/git/repositories/gitlab/gitlabhq
This commit is contained in:
commit
c44c5f5faa
|
@ -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:
|
||||
|
|
|
@ -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?
|
||||
|
|
Loading…
Reference in New Issue