diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-05 03:08:41 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-05 03:08:41 +0300 |
| commit | e40710ab8a30f36d7c82d7d6497033291840eec9 (patch) | |
| tree | aea450b24cb1bd8023c1d297e4f01de4e88926b2 /config/initializers/graphql.rb | |
| parent | 51612d3ef5be853289008694c40973b479e8547c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers/graphql.rb')
| -rw-r--r-- | config/initializers/graphql.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |