diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-27 16:03:50 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-27 16:03:50 +0300 |
| commit | 636ea40e182fca92e89facbcb52445fcefef9506 (patch) | |
| tree | c555ba8f65dd8c468c0539b32836ad65f67e731b /lib/api | |
| parent | 31044d41a63dd1b8f57df12b864210d84361c219 (diff) | |
| parent | a79094b29205929ab78d89e10e768787f7aff7d6 (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!20679
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/settings.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/settings.rb b/lib/api/settings.rb index 1ca7d23203b..19d5e66c77e 100644 --- a/lib/api/settings.rb +++ b/lib/api/settings.rb @@ -130,6 +130,7 @@ module API optional :gitaly_timeout_medium, type: Integer, desc: 'Medium Gitaly timeout, in seconds. Set to 0 to disable timeouts.' optional :gitaly_timeout_fast, type: Integer, desc: 'Gitaly fast operation timeout, in seconds. Set to 0 to disable timeouts.' optional :usage_ping_enabled, type: Boolean, desc: 'Every week GitLab will report license usage back to GitLab, Inc.' + 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", |