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 /lib/api/settings.rb | |
| 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 'lib/api/settings.rb')
| -rw-r--r-- | lib/api/settings.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/api/settings.rb b/lib/api/settings.rb index d96cdc31212..b064747e5fc 100644 --- a/lib/api/settings.rb +++ b/lib/api/settings.rb @@ -168,7 +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.visible_attributes, + *::ApplicationSettingsHelper.external_authorization_service_attributes, + :performance_bar_allowed_group_id] if Gitlab.ee? optional_attributes += EE::ApplicationSettingsHelper.possible_licensed_attributes |