summaryrefslogtreecommitdiff
path: root/app/graphql
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-11 00:09:09 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-11 00:09:09 +0000
commit47ebeef9122af96dc1fcd5c8e1ca0091f62fa113 (patch)
treef140bf150d6670b734e981851070e73c270fc45f /app/graphql
parent06bb4eba7828ce59fde366734828458c037059b4 (diff)
downloadgitlab-ce-47ebeef9122af96dc1fcd5c8e1ca0091f62fa113.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/graphql')
-rw-r--r--app/graphql/gitlab_schema.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/graphql/gitlab_schema.rb b/app/graphql/gitlab_schema.rb
index 5a4a223093e..b81996cf378 100644
--- a/app/graphql/gitlab_schema.rb
+++ b/app/graphql/gitlab_schema.rb
@@ -16,6 +16,7 @@ class GitlabSchema < GraphQL::Schema
use Gitlab::Graphql::CallsGitaly
use Gitlab::Graphql::Connections
use Gitlab::Graphql::GenericTracing
+ use Gitlab::Graphql::Timeout, max_seconds: Gitlab.config.gitlab.graphql_timeout
query_analyzer Gitlab::Graphql::QueryAnalyzers::LoggerAnalyzer.new
query_analyzer Gitlab::Graphql::QueryAnalyzers::RecursionAnalyzer.new