summaryrefslogtreecommitdiff
path: root/config/gitlab.yml.example
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-05 03:08:49 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-05 03:08:49 +0000
commit79cbe31b18159ea394c6f6e3027c1dc69bdabb75 (patch)
tree2f7290dd776762b18d0b4b95b81d380499f021ed /config/gitlab.yml.example
parente40710ab8a30f36d7c82d7d6497033291840eec9 (diff)
downloadgitlab-ce-79cbe31b18159ea394c6f6e3027c1dc69bdabb75.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/gitlab.yml.example')
-rw-r--r--config/gitlab.yml.example6
1 files changed, 6 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index ed5701b6f75..19dadbfd312 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -145,6 +145,12 @@ production: &base
# Number of seconds to wait for HTTP response after sending webhook HTTP POST request (default: 10)
# webhook_timeout: 10
+ ### GraphQL Settings
+ # Tells the rails application how long it has to complete a GraphQL request.
+ # We suggest this value to be higher than the database timeout value
+ # and lower than the worker timeout set in unicorn/puma. (default: 30)
+ # graphql_timeout: 30
+
## Repository downloads directory
# When a user clicks e.g. 'Download zip' on a project, a temporary zip file is created in the following directory.
# The default is 'shared/cache/archive/' relative to the root of the Rails app.