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/controllers/admin | |
| parent | 254d1d7aa07fd1b45dd4090e98bcba86f5d3c699 (diff) | |
| download | gitlab-ce-aad6ceaef9ccfba8e058012a0877b80c103a3838.tar.gz | |
Allow configuring protection of the default branch upon first push
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index a937f484877..7458542fc73 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -22,6 +22,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController def application_setting_params params.require(:application_setting).permit( :default_projects_limit, + :default_branch_protection, :signup_enabled, :signin_enabled, :gravatar_enabled, |