diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-05-30 10:50:30 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-05-30 10:50:30 -0700 |
| commit | c20766e808a7d4167ae55ba28315e3e4dc972b7e (patch) | |
| tree | d0f301d7627375b16e425ba340e87d878baf5420 /lib | |
| parent | 439adb96dadd49124d080db0db0b0076d2049c6b (diff) | |
| download | gitlab-ce-c20766e808a7d4167ae55ba28315e3e4dc972b7e.tar.gz | |
Add missing usage_ping_enabled to API settings
Identified while resolving conflicts in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5906
Diffstat (limited to 'lib')
| -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", |