summaryrefslogtreecommitdiff
path: root/app/controllers/admin/application_settings_controller.rb
diff options
context:
space:
mode:
authorPatricio Cano <suprnova32@gmail.com>2016-06-15 17:30:55 -0500
committerPatricio Cano <suprnova32@gmail.com>2016-07-05 16:54:22 -0500
commit512adc21feff5135de94d23ed6808296b365490a (patch)
treea1067fee6ea02eeae2f13750f17b64ff7544a9b0 /app/controllers/admin/application_settings_controller.rb
parent1141eaf5c83f927ccc064b6c5d162081fdd22894 (diff)
downloadgitlab-ce-512adc21feff5135de94d23ed6808296b365490a.tar.gz
Add setting that allows admins to choose which Git access protocols are enabled
Diffstat (limited to 'app/controllers/admin/application_settings_controller.rb')
-rw-r--r--app/controllers/admin/application_settings_controller.rb1
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 5f65dd3aff0..51ae9264ed7 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -110,6 +110,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
:send_user_confirmation_email,
:container_registry_token_expire_delay,
:repository_storage,
+ :enabled_git_access_protocols,
restricted_visibility_levels: [],
import_sources: [],
disabled_oauth_sign_in_sources: []