Synchronize default issue closing pattern in documetation and implementation, fixes #6742

Robert Schilling
1 parent 0f31acd0
Showing 2 changed files with 4 additions and 4 deletions Show diff stats
config/gitlab.yml.example
config/initializers/1_settings.rb
@@ -20,7 +20,7 @@ production: &amp;base
     https: false
     # Uncomment and customize the last line to run in a non-root path
-    # WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this. 
+    # WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this.
     # Note that four settings need to be changed for this to work.
     # 1) In your application.rb file: config.relative_url_root = "/gitlab"
     # 2) In your gitlab.yml file: relative_url_root: /gitlab
@@ -69,7 +69,7 @@ production: &amp;base
     # If a commit message matches this regular expression, all issues referenced from the matched text will be closed.
     # This happens 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]lose[sd]|[Ff]ixe[sd]) +#\d+'
+    # issue_closing_pattern: '([Cc]lose[sd]|[Ff]ixe[sd]) #(\d+)'
     ## Default project features settings
     default_projects_features:
@@ -107,7 +107,7 @@ production: &amp;base
     #   ##  :project_id        - GitLab project identifier
     #   ##  :issues_tracker_id - Project Name or Id in external issue tracker
     #   new_issue_url: "http://redmine.sample/projects/:issues_tracker_id/issues/new"
-    # 
+    #
     # jira:
     #   title: "Atlassian Jira"
     #   project_url: "http://jira.sample/issues/?jql=project=:issues_tracker_id"
@@ -90,7 +90,7 @@ Settings.gitlab[&#39;signup_enabled&#39;] ||= false
 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]loses|[Ff]ixes) #(\d+)' if Settings.gitlab['issue_closing_pattern'].nil?
+Settings.gitlab['issue_closing_pattern'] = '([Cc]lose[sd]|[Ff]ixe[sd]) #(\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?
	@@ -20,7 +20,7 @@ production: &base		@@ -20,7 +20,7 @@ production: &base
20	https: false	20	https: false
21		21
22	# Uncomment and customize the last line to run in a non-root path	22	# Uncomment and customize the last line to run in a non-root path
23	- # WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this.	23	+ # WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this.
24	# Note that four settings need to be changed for this to work.	24	# Note that four settings need to be changed for this to work.
25	# 1) In your application.rb file: config.relative_url_root = "/gitlab"	25	# 1) In your application.rb file: config.relative_url_root = "/gitlab"
26	# 2) In your gitlab.yml file: relative_url_root: /gitlab	26	# 2) In your gitlab.yml file: relative_url_root: /gitlab
	@@ -69,7 +69,7 @@ production: &base		@@ -69,7 +69,7 @@ production: &base
69	# If a commit message matches this regular expression, all issues referenced from the matched text will be closed.	69	# If a commit message matches this regular expression, all issues referenced from the matched text will be closed.
70	# This happens when the commit is pushed or merged into the default branch of a project.	70	# This happens when the commit is pushed or merged into the default branch of a project.
71	# When not specified the default issue_closing_pattern as specified below will be used.	71	# When not specified the default issue_closing_pattern as specified below will be used.
72	- # issue_closing_pattern: '([Cc]lose[sd]\|[Ff]ixe[sd]) +#\d+'	72	+ # issue_closing_pattern: '([Cc]lose[sd]\|[Ff]ixe[sd]) #(\d+)'
73		73
74	## Default project features settings	74	## Default project features settings
75	default_projects_features:	75	default_projects_features:
	@@ -107,7 +107,7 @@ production: &base		@@ -107,7 +107,7 @@ production: &base
107	# ## :project_id - GitLab project identifier	107	# ## :project_id - GitLab project identifier
108	# ## :issues_tracker_id - Project Name or Id in external issue tracker	108	# ## :issues_tracker_id - Project Name or Id in external issue tracker
109	# new_issue_url: "http://redmine.sample/projects/:issues_tracker_id/issues/new"	109	# new_issue_url: "http://redmine.sample/projects/:issues_tracker_id/issues/new"
110	- #	110	+ #
111	# jira:	111	# jira:
112	# title: "Atlassian Jira"	112	# title: "Atlassian Jira"
113	# project_url: "http://jira.sample/issues/?jql=project=:issues_tracker_id"	113	# project_url: "http://jira.sample/issues/?jql=project=:issues_tracker_id"
	@@ -90,7 +90,7 @@ Settings.gitlab['signup_enabled'] \|\|= false		@@ -90,7 +90,7 @@ Settings.gitlab['signup_enabled'] \|\|= false
90	Settings.gitlab['signin_enabled'] \|\|= true if Settings.gitlab['signin_enabled'].nil?	90	Settings.gitlab['signin_enabled'] \|\|= true if Settings.gitlab['signin_enabled'].nil?
91	Settings.gitlab['restricted_visibility_levels'] = Settings.send(:verify_constant_array, Gitlab::VisibilityLevel, Settings.gitlab['restricted_visibility_levels'], [])	91	Settings.gitlab['restricted_visibility_levels'] = Settings.send(:verify_constant_array, Gitlab::VisibilityLevel, Settings.gitlab['restricted_visibility_levels'], [])
92	Settings.gitlab['username_changing_enabled'] = true if Settings.gitlab['username_changing_enabled'].nil?	92	Settings.gitlab['username_changing_enabled'] = true if Settings.gitlab['username_changing_enabled'].nil?
93	-Settings.gitlab['issue_closing_pattern'] = '([Cc]loses\|[Ff]ixes) #(\d+)' if Settings.gitlab['issue_closing_pattern'].nil?	93	+Settings.gitlab['issue_closing_pattern'] = '([Cc]lose[sd]\|[Ff]ixe[sd]) #(\d+)' if Settings.gitlab['issue_closing_pattern'].nil?
94	Settings.gitlab['default_projects_features'] \|\|= {}	94	Settings.gitlab['default_projects_features'] \|\|= {}
95	Settings.gitlab.default_projects_features['issues'] = true if Settings.gitlab.default_projects_features['issues'].nil?	95	Settings.gitlab.default_projects_features['issues'] = true if Settings.gitlab.default_projects_features['issues'].nil?
96	Settings.gitlab.default_projects_features['merge_requests'] = true if Settings.gitlab.default_projects_features['merge_requests'].nil?	96	Settings.gitlab.default_projects_features['merge_requests'] = true if Settings.gitlab.default_projects_features['merge_requests'].nil?