diff options
| author | Marco Wessel <marco@poop.nl> | 2015-01-25 16:33:54 +0100 |
|---|---|---|
| committer | Marco Wessel <marco@poop.nl> | 2015-01-25 17:09:10 +0100 |
| commit | aad6ceaef9ccfba8e058012a0877b80c103a3838 (patch) | |
| tree | 33042a755f2c35024c140f20e9d63aba7e450ff4 /app/models/application_setting.rb | |
| parent | 254d1d7aa07fd1b45dd4090e98bcba86f5d3c699 (diff) | |
| download | gitlab-ce-aad6ceaef9ccfba8e058012a0877b80c103a3838.tar.gz | |
Allow configuring protection of the default branch upon first push
Diffstat (limited to 'app/models/application_setting.rb')
| -rw-r--r-- | app/models/application_setting.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 45ae79a75cc..3285a1a248e 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -4,6 +4,7 @@ # # id :integer not null, primary key # default_projects_limit :integer +# default_branch_protection :integer # signup_enabled :boolean # signin_enabled :boolean # gravatar_enabled :boolean @@ -25,6 +26,7 @@ class ApplicationSetting < ActiveRecord::Base def self.create_from_defaults create( 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'], |