diff options
| author | Imre Farkas <ifarkas@gitlab.com> | 2019-04-05 11:45:47 +0000 |
|---|---|---|
| committer | Andreas Brandl <abrandl@gitlab.com> | 2019-04-05 11:45:47 +0000 |
| commit | d9d7237d2ebf101ca35ed8ba2740e7c7093437ea (patch) | |
| tree | 419b0af4bc8de6de5888feec4f502bcc468df400 /lib/api/settings.rb | |
| parent | 30fa3cbdb74df2dfeebb2929a10dd301a0dde55e (diff) | |
| download | gitlab-ce-d9d7237d2ebf101ca35ed8ba2740e7c7093437ea.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 d742c6c97c1..120c5f4ccfc 100644 --- a/lib/api/settings.rb +++ b/lib/api/settings.rb @@ -167,7 +167,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 |