diff options
| author | Imre Farkas <ifarkas@gitlab.com> | 2019-04-04 14:06:20 +0200 |
|---|---|---|
| committer | Imre Farkas <ifarkas@gitlab.com> | 2019-04-12 14:41:09 +0200 |
| commit | 649ebf854b5788d323bd0755f2359ef60acef048 (patch) | |
| tree | aeb1b5e941cfd98ad7df01637a1d8eec7234e85e /lib/api/settings.rb | |
| parent | 26546fba2ae6d56635c810a0b3fd900fe024f8d0 (diff) | |
| download | gitlab-ce-if-external_auth-11-10.tar.gz | |
Fix reviewif-external_auth-11-10
Diffstat (limited to 'lib/api/settings.rb')
| -rw-r--r-- | lib/api/settings.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/api/settings.rb b/lib/api/settings.rb index 483c53f8d82..b064747e5fc 100644 --- a/lib/api/settings.rb +++ b/lib/api/settings.rb @@ -168,9 +168,9 @@ module API optional :usage_ping_enabled, type: Boolean, desc: 'Every week GitLab will report license usage back to GitLab, Inc.' end - optional_attributes = ::ApplicationSettingsHelper.visible_attributes << :performance_bar_allowed_group_id - - optional_attributes += ::ApplicationSettingsHelper.external_authorization_service_attributes + optional_attributes = [*::ApplicationSettingsHelper.visible_attributes, + *::ApplicationSettingsHelper.external_authorization_service_attributes, + :performance_bar_allowed_group_id] if Gitlab.ee? optional_attributes += EE::ApplicationSettingsHelper.possible_licensed_attributes |