Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-23 21:09:05 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-23 21:09:05 +0300
commitf986ce9ffa56e25d0a3010c78d9481664742d766 (patch)
tree78101b120770aae5634b442a15e742a176f6468b /app/controllers/graphql_controller.rb
parentc46b011d3f578d2455443dfabf24226c738c8903 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/graphql_controller.rb')
-rw-r--r--app/controllers/graphql_controller.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/graphql_controller.rb b/app/controllers/graphql_controller.rb
index 82005c548f2..a13ec1daddb 100644
--- a/app/controllers/graphql_controller.rb
+++ b/app/controllers/graphql_controller.rb
@@ -146,8 +146,7 @@ class GraphqlController < ApplicationController
end
def logs
- RequestStore.store[:graphql_logs].to_h
- .except(:duration_s, :query_string)
- .merge(operation_name: params[:operationName])
+ RequestStore.store[:graphql_logs].to_a
+ .map { |log| log.except(:duration_s, :query_string) }
end
end