summaryrefslogtreecommitdiff
path: root/lib/gitlab/current_settings.rb
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 /lib/gitlab/current_settings.rb
parent254d1d7aa07fd1b45dd4090e98bcba86f5d3c699 (diff)
downloadgitlab-ce-aad6ceaef9ccfba8e058012a0877b80c103a3838.tar.gz
Allow configuring protection of the default branch upon first push
Diffstat (limited to 'lib/gitlab/current_settings.rb')
-rw-r--r--lib/gitlab/current_settings.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb
index 2c5660df373..75afc024a62 100644
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
@@ -12,6 +12,7 @@ module Gitlab
def fake_application_settings
OpenStruct.new(
default_projects_limit: Settings.gitlab['default_projects_limit'],
+ default_branch_protection: Settings.gitlab['default_branch_protection'],
signup_enabled: Settings.gitlab['signup_enabled'],
signin_enabled: Settings.gitlab['signin_enabled'],
gravatar_enabled: Settings.gravatar['enabled'],