diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-05-30 20:30:42 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-05-30 20:30:42 +0000 |
| commit | a8a029268aa71d37a4c264e37870f8bb20bfbdda (patch) | |
| tree | b134b38248b9016cc6325ffc8235c3b0ec18f038 | |
| parent | 77462804879488f08f237ec14f5bc9571536d891 (diff) | |
| parent | c20766e808a7d4167ae55ba28315e3e4dc972b7e (diff) | |
| download | gitlab-ce-a8a029268aa71d37a4c264e37870f8bb20bfbdda.tar.gz | |
Merge branch 'sh-add-usage-ping-api-settings' into 'master'
Add missing usage_ping_enabled to API settings
See merge request gitlab-org/gitlab-ce!19263
| -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 4b506127c0e..02ef89f997f 100644 --- a/lib/api/settings.rb +++ b/lib/api/settings.rb @@ -129,6 +129,7 @@ module API optional :gitaly_timeout_default, type: Integer, desc: 'Default Gitaly timeout, in seconds. Set to 0 to disable timeouts.' 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.' ApplicationSetting::SUPPORTED_KEY_TYPES.each do |type| optional :"#{type}_key_restriction", |