diff options
| author | Andreas Brandl <abrandl@gitlab.com> | 2019-04-05 13:02:56 +0000 |
|---|---|---|
| committer | Andreas Brandl <abrandl@gitlab.com> | 2019-04-05 13:02:56 +0000 |
| commit | 46b1b9c1d61c269588bd3cd4203420608ddd7f0b (patch) | |
| tree | a877f5366d3367e1264e96f3f5e8a4b23bdbd62a /app/controllers/admin/application_settings_controller.rb | |
| parent | 7a48a06cf3b454021aa466464686fee8c82d6862 (diff) | |
| download | gitlab-ce-46b1b9c1d61c269588bd3cd4203420608ddd7f0b.tar.gz | |
Revert "Merge branch 'if-57131-external_auth_to_ce' into 'master'"
This reverts merge request !26823
Diffstat (limited to 'app/controllers/admin/application_settings_controller.rb')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index b681949ab36..ab792cf7403 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -124,9 +124,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController end def visible_application_setting_attributes - [ - *::ApplicationSettingsHelper.visible_attributes, - *::ApplicationSettingsHelper.external_authorization_service_attributes, + ApplicationSettingsHelper.visible_attributes + [ :domain_blacklist_file, disabled_oauth_sign_in_sources: [], import_sources: [], |