Merge branch 'master' into 'master'

Add issue_closing_pattern to gitlab.rb This is working for me in adding an issue_closing_pattern value to the generated gitlab.yml. I'm new at ruby, so forgive me if I've made any mistakes here. Backslashes in the regular expression used in gitlab.rb must be escaped. Associated issue: https://gitlab.com/gitlab-org/omnibus-gitlab/issues/232 See merge request !198

Merge branch 'master' into 'master'
Add issue_closing_pattern to gitlab.rb This is working for me in adding an issue_closing_pattern value to the generated gitlab.yml. I'm new at ruby, so forgive me if I've made any mistakes here. Backslashes in the regular expression used in gitlab.rb must be escaped. Associated issue: https://gitlab.com/gitlab-org/omnibus-gitlab/issues/232 See merge request !198
Jacob Vosmaer
2 parents 394428c8 c97310e3
Showing 1 changed file with 1 additions and 0 deletions Show diff stats
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
@@ -64,6 +64,7 @@ production: &amp;base
     # When not specified the default issue_closing_pattern as specified below will be used.
     # Tip: you can test your closing pattern at http://rubular.com
     # issue_closing_pattern: '([Cc]lose[sd]|[Ff]ixe[sd]) +#\d+'
+    issue_closing_pattern: <%= single_quote(@gitlab_issue_closing_pattern) %>
  
     ## Default project features settings
     default_projects_features:
...	...	@@ -64,6 +64,7 @@ production: &base
64	64	# When not specified the default issue_closing_pattern as specified below will be used.
65	65	# Tip: you can test your closing pattern at http://rubular.com
66	66	# issue_closing_pattern: '([Cc]lose[sd]\|[Ff]ixe[sd]) +#\d+'
	67	+ issue_closing_pattern: <%= single_quote(@gitlab_issue_closing_pattern) %>
67	68
68	69	## Default project features settings
69	70	default_projects_features:
...	...