From f986ce9ffa56e25d0a3010c78d9481664742d766 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 23 Mar 2021 18:09:05 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/controllers/graphql_controller.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'app/controllers/graphql_controller.rb') 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 -- cgit v1.2.3