Merge branch 'master' into 31053-pipeline-ux31053-pipeline-ux

* master:
  Fallback to default pattern when note does not belong to project
  Merge request widget redesign
  Fixed focused test in notes spec
  Fixed UP arrow key not editing last comment in discussion
  Fix skipped manual actions issue in pipeline processing
  Fix notify_only_default_branch check for Slack service

1 files changed, 14 insertions, 0 deletions

diff --git a/app/controllers/projects/deployments_controller.rb b/app/controllers/projects/deployments_controller.rb
index c319671456d..b33c0b00ad9 100644
--- a/app/controllers/projects/deployments_controller.rb
+++ b/app/controllers/projects/deployments_controller.rb
@@ -10,8 +10,22 @@ class Projects::DeploymentsController < Projects::ApplicationController
                                   .represent_concise(deployments) }
   end
 
+  def metrics
+    @metrics = deployment.metrics(1.hour)
+
+    if @metrics&.any?
+      render json: @metrics, status: :ok
+    else
+      head :no_content
+    end
+  end
+
   private
 
+  def deployment
+    @deployment ||= environment.deployments.find_by(iid: params[:id])
+  end
+
   def environment
     @environment ||= project.environments.find(params[:environment_id])
   end