From 4d0c47058a89d71d3417ad3bd73781882c8998e8 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 20 Feb 2020 21:08:48 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- config/initializers/graphql.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'config/initializers') diff --git a/config/initializers/graphql.rb b/config/initializers/graphql.rb index 44a9644f481..81317a3d87a 100644 --- a/config/initializers/graphql.rb +++ b/config/initializers/graphql.rb @@ -6,8 +6,6 @@ GraphQL::Field.accepts_definitions(authorize: GraphQL::Define.assign_metadata_ke 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: 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 +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 -- cgit v1.2.3