Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatricio Cano <suprnova32@gmail.com>2016-07-20 01:08:40 +0300
committerPatricio Cano <suprnova32@gmail.com>2016-07-20 01:08:40 +0300
commit1a057d2b4013feb151e77aa71dd0b5a83412d2d6 (patch)
treed301a9de92f6bcd8c715e5ee9b09b62ee92825ec /app/controllers
parent4be1adea21a5994be948b42a04cb20ecd3714db1 (diff)
Reorder allowed params for `ApplicationSetting` and add more details to docs.
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/admin/application_settings_controller.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index c5b44ff8c44..9e1dc15de84 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -85,6 +85,9 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
:default_snippet_visibility,
:default_group_visibility,
:domain_whitelist_raw,
+ :domain_blacklist_enabled,
+ :domain_blacklist_raw,
+ :domain_blacklist_file,
:version_check_enabled,
:admin_notification_email,
:user_oauth_applications,
@@ -113,9 +116,6 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
:container_registry_token_expire_delay,
:repository_storage,
:enabled_git_access_protocol,
- :domain_blacklist_enabled,
- :domain_blacklist_raw,
- :domain_blacklist_file,
restricted_visibility_levels: [],
import_sources: [],
disabled_oauth_sign_in_sources: []