Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

1 files changed, 16 insertions, 5 deletions

diff --git a/app/graphql/resolvers/metrics/dashboard_resolver.rb b/app/graphql/resolvers/metrics/dashboard_resolver.rb
index f569cb0b2c3..a82a4a95254 100644
--- a/app/graphql/resolvers/metrics/dashboard_resolver.rb
+++ b/app/graphql/resolvers/metrics/dashboard_resolver.rb
@@ -3,19 +3,30 @@
 module Resolvers
   module Metrics
     class DashboardResolver < Resolvers::BaseResolver
+      type Types::Metrics::DashboardType, null: true
+      calls_gitaly!
+
       argument :path, GraphQL::STRING_TYPE,
                required: true,
-               description: "Path to a file which defines metrics dashboard eg: 'config/prometheus/common_metrics.yml'."
-
-      type Types::Metrics::DashboardType, null: true
+               description: "Path to a file which defines metrics dashboard " \
+                            "eg: 'config/prometheus/common_metrics.yml'."
 
       alias_method :environment, :object
 
       def resolve(**args)
         return unless environment
 
-        ::PerformanceMonitoring::PrometheusDashboard
-          .find_for(project: environment.project, user: context[:current_user], path: args[:path], options: { environment: environment })
+        ::PerformanceMonitoring::PrometheusDashboard.find_for(**args, **service_params)
+      end
+
+      private
+
+      def service_params
+        {
+          project: environment.project,
+          user: current_user,
+          options: { environment: environment }
+        }
       end
     end
   end