From e40710ab8a30f36d7c82d7d6497033291840eec9 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 5 Feb 2020 00:08:41 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- config/initializers/graphql.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/initializers/graphql.rb') diff --git a/config/initializers/graphql.rb b/config/initializers/graphql.rb index 206c4daceac..44a9644f481 100644 --- a/config/initializers/graphql.rb +++ b/config/initializers/graphql.rb @@ -7,7 +7,7 @@ GraphQL::Schema::Object.accepts_definition(:authorize) GraphQL::Schema::Field.accepts_definition(:authorize) Gitlab::Application.config.after_initialize do - GitlabSchema.middleware << GraphQL::Schema::TimeoutMiddleware.new(max_seconds: ENV.fetch('GITLAB_RAILS_GRAPHQL_TIMEOUT', 30).to_i) do |timeout_error, query| + GitlabSchema.middleware << GraphQL::Schema::TimeoutMiddleware.new(max_seconds: Gitlab.config.gitlab.graphql_timeout) do |timeout_error, query| Gitlab::GraphqlLogger.error(message: timeout_error.to_s, query: query.query_string, query_variables: query.provided_variables) end end -- cgit v1.2.1