summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorMarco Wessel <marco@poop.nl>2015-01-25 16:33:54 +0100
committerMarco Wessel <marco@poop.nl>2015-01-25 17:09:10 +0100
commitaad6ceaef9ccfba8e058012a0877b80c103a3838 (patch)
tree33042a755f2c35024c140f20e9d63aba7e450ff4 /config
parent254d1d7aa07fd1b45dd4090e98bcba86f5d3c699 (diff)
downloadgitlab-ce-aad6ceaef9ccfba8e058012a0877b80c103a3838.tar.gz
Allow configuring protection of the default branch upon first push
Diffstat (limited to 'config')
-rw-r--r--config/initializers/1_settings.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 1ec842761ff..2c8441ece08 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -87,6 +87,7 @@ Settings['issues_tracker'] ||= {}
#
Settings['gitlab'] ||= Settingslogic.new({})
Settings.gitlab['default_projects_limit'] ||= 10
+Settings.gitlab['default_branch_protection'] ||= 2
Settings.gitlab['default_can_create_group'] = true if Settings.gitlab['default_can_create_group'].nil?
Settings.gitlab['default_theme'] = Gitlab::Theme::MARS if Settings.gitlab['default_theme'].nil?
Settings.gitlab['host'] ||= 'localhost'