Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Newdigate <andrew@gitlab.com>2017-11-29 12:12:12 +0300
committerRémy Coutable <remy@rymai.me>2017-11-29 12:12:12 +0300
commit64e5f996fa01d2e9c8462cfbb647997531eaf6c7 (patch)
treeb3bebc2fd1be9822f8be2124aee9acff5acd3ded /app/helpers
parenta4f8dddc212fcd91f6a4a09e92b2de6117a21305 (diff)
Add timeouts for Gitaly calls
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/application_settings_helper.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index 6fc4248b245..5bb84984142 100644
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -177,6 +177,9 @@ module ApplicationSettingsHelper
:ed25519_key_restriction,
:email_author_in_body,
:enabled_git_access_protocol,
+ :gitaly_timeout_default,
+ :gitaly_timeout_medium,
+ :gitaly_timeout_fast,
:gravatar_enabled,
:hashed_storage_enabled,
:help_page_hide_commercial_content,