Commit 5c352206 authored by Matthieu Vachon's avatar Matthieu Vachon

Added possibility to configure issue closing pattern in gitlab main config file

parent 7693d12f
......@@ -68,6 +68,7 @@ default['gitlab']['host'] = "localhost"
default['gitlab']['email_from'] = "gitlab@localhost"
default['gitlab']['support_email'] = "support@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
......
......@@ -16,6 +16,7 @@ template File.join(gitlab['path'], 'config', 'gitlab.yml') do
:user => gitlab['user'],
:email_from => gitlab['email_from'],
:support_email => gitlab['support_email'],
:issue_closing_pattern => gitlab['issue_closing_pattern'],
:max_size => gitlab['max_size'],
:git_timeout => gitlab['git_timeout'],
:satellites_path => gitlab['satellites_path'],
......
......@@ -21,6 +21,7 @@ describe "gitlab::install" do
user: 'git',
email_from: 'gitlab@localhost',
support_email: 'support@localhost',
issue_closing_pattern: "([Cc]lose[sd]|[Ff]ixe[sd]) #(\d+)",
max_size: '20971520',
git_timeout: 10,
satellites_path: '/home/git/gitlab-satellites',
......@@ -457,6 +458,7 @@ describe "gitlab::install" do
user: 'git',
email_from: 'gitlab@localhost',
support_email: 'support@localhost',
issue_closing_pattern: "([Cc]lose[sd]|[Ff]ixe[sd]) #(\d+)",
max_size: '20971520',
git_timeout: 10,
satellites_path: '/home/git/gitlab-satellites',
......
......@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment