diff options
| author | Imre Farkas <ifarkas@gitlab.com> | 2019-04-09 15:38:58 +0000 |
|---|---|---|
| committer | Andreas Brandl <abrandl@gitlab.com> | 2019-04-09 15:38:58 +0000 |
| commit | 9bc5ed14fe97fe63cd5be30c013c6af978715621 (patch) | |
| tree | 74e1548a29b4683e94720b346a4fc41a068b2583 /app/controllers/admin | |
| parent | a6218f1bcd78f656d57330e764d3f98e1fb1f3f3 (diff) | |
| download | gitlab-ce-9bc5ed14fe97fe63cd5be30c013c6af978715621.tar.gz | |
Move Contribution Analytics related spec in spec/features/groups/group_page_with_external_authorization_service_spec to EE
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index ab792cf7403..b681949ab36 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -124,7 +124,9 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController end def visible_application_setting_attributes - ApplicationSettingsHelper.visible_attributes + [ + [ + *::ApplicationSettingsHelper.visible_attributes, + *::ApplicationSettingsHelper.external_authorization_service_attributes, :domain_blacklist_file, disabled_oauth_sign_in_sources: [], import_sources: [], |