Merge branch 'feature-customize-issue-closing-pattern' of...

Merge branch 'feature-customize-issue-closing-pattern' of https://gitlab.com/matthieu.o.vachon/cookbook-gitlab into matthieu.o.vachon/cookbook-gitlab-feature-customize-issue-closing-pattern

Conflicts:
	recipes/install.rb
	spec/install_spec.rb

attributes/default.rb

@@ -67,6 +67,7 @@ default['gitlab']['git_path'] = "/usr/local/bin/git"
 default['gitlab']['host'] = "localhost"
 default['gitlab']['email_from'] = "gitlab@localhost"
+default['gitlab']['issue_closing_pattern'] = "([Cc]lose[sd]|[Ff]ixe[sd]) #(\d+)"
 default['gitlab']['max_size'] = "20971520" # 20.megabytes
 default['gitlab']['git_timeout'] = 10
 default['gitlab']['signup_enabled'] = false

recipes/install.rb

@@ -15,6 +15,7 @@ template File.join(gitlab['path'], 'config', 'gitlab.yml') do
     :port => gitlab['port'],
     :user => gitlab['user'],
     :email_from => gitlab['email_from'],
+    :issue_closing_pattern => gitlab['issue_closing_pattern'],
     :max_size => gitlab['max_size'],
     :git_timeout => gitlab['git_timeout'],
     :satellites_path => gitlab['satellites_path'],

spec/install_spec.rb

@@ -20,6 +20,7 @@ describe "gitlab::install" do
             port: '80',
             user: 'git',
             email_from: 'gitlab@localhost',
+            issue_closing_pattern: "([Cc]lose[sd]|[Ff]ixe[sd]) #(\d+)",
             max_size: '20971520',
             git_timeout: 10,
             satellites_path: '/home/git/gitlab-satellites',
@@ -454,6 +455,7 @@ describe "gitlab::install" do
             port: '80',
             user: 'git',
             email_from: 'gitlab@localhost',
+            issue_closing_pattern: "([Cc]lose[sd]|[Ff]ixe[sd]) #(\d+)",
             max_size: '20971520',
             git_timeout: 10,
             satellites_path: '/home/git/gitlab-satellites',

templates/default/gitlab.yml.erb

@@ -68,7 +68,7 @@ production: &base
     # 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.
     # Tip: you can test your closing pattern at http://rubular.com
-    # issue_closing_pattern: '([Cc]lose[sd]|[Ff]ixe[sd]) #(\d+)'
+    issue_closing_pattern: '<%= @issue_closing_pattern %>'
     ## Default project features settings
     default_projects_features: