diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-08-01 18:17:47 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-08-01 18:17:47 +0300 |
| commit | ea6fc714bb0306ac8ca56b5dafe4b6777aafe5fc (patch) | |
| tree | 5d9673f0e526acbdb3285147024064f89d45dc23 /lib/api | |
| parent | 47244ad5ea4e887ecb6dffa9f7b96846adbf4b6f (diff) | |
| parent | 29dd1c14db6899c3858ca906e076c7b7fbbaa0e2 (diff) | |
Merge branch '41416-making-instance-wide-data-tools-more-accessible' into 'master'
Resolve "Making instance-wide data tools more accessible"
Closes #41416 and #48507
See merge request gitlab-org/gitlab-ce!20874
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/settings.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/api/settings.rb b/lib/api/settings.rb index 6601c268d79..897010217dc 100644 --- a/lib/api/settings.rb +++ b/lib/api/settings.rb @@ -127,9 +127,7 @@ module API optional :signup_enabled, type: Boolean, desc: 'Flag indicating if sign up is enabled' optional :terminal_max_session_time, type: Integer, desc: 'Maximum time for web terminal websocket connection (in seconds). Set to 0 for unlimited time.' optional :usage_ping_enabled, type: Boolean, desc: 'Every week GitLab will report license usage back to GitLab, Inc.' - optional :user_default_external, type: Boolean, desc: 'Newly registered users will by default be external' - optional :user_oauth_applications, type: Boolean, desc: 'Allow users to register any application to use GitLab as an OAuth provider' - optional :version_check_enabled, type: Boolean, desc: 'Let GitLab inform you when an update is available.' + optional :instance_statistics_visibility_private, type: Boolean, desc: 'When set to `true` Instance statistics will only be available to admins' ApplicationSetting::SUPPORTED_KEY_TYPES.each do |type| optional :"#{type}_key_restriction", |