diff options
| author | Phil Hughes <me@iamphill.com> | 2017-11-30 09:52:58 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-11-30 09:52:58 +0000 |
| commit | 386cbf22ee8fc1d206e76f0f34568379ae726e02 (patch) | |
| tree | 4976d52023637beaa5046035b64554dd451f0d27 /lib/api/settings.rb | |
| parent | 1880809d8ef9b650d1af615ebbaa590626ccf17f (diff) | |
| parent | 73e48b745c34c048c56abf28e6c278707d9bd2f3 (diff) | |
| download | gitlab-ce-386cbf22ee8fc1d206e76f0f34568379ae726e02.tar.gz | |
Merge branch 'master' into multi-file-editor-dirty-diff-indicator
Diffstat (limited to 'lib/api/settings.rb')
| -rw-r--r-- | lib/api/settings.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/api/settings.rb b/lib/api/settings.rb index 06373fe5069..cee4d309816 100644 --- a/lib/api/settings.rb +++ b/lib/api/settings.rb @@ -123,6 +123,9 @@ module API end optional :terminal_max_session_time, type: Integer, desc: 'Maximum time for web terminal websocket connection (in seconds). Set to 0 for unlimited time.' optional :polling_interval_multiplier, type: BigDecimal, desc: 'Interval multiplier used by endpoints that perform polling. Set to 0 to disable polling.' + 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.' ApplicationSetting::SUPPORTED_KEY_TYPES.each do |type| optional :"#{type}_key_restriction", |