Merge branch 'master' into 30286-vue-loadin-icon30286-vue-loadin-icon

* master: (62 commits)
  Fix broken test - load correct data
  Remove redirect for old issue url containing id instead of iid
  Use vue file for table pagination component
  stub error handlers where uncaught Promise rejections currently exist
  Revert "Fix OpenID spec failure that assumed current_sign_in_at would be set"
  Add :redis keyword to some specs clear state of trackable attributes
  Fix OpenID spec failure that assumed current_sign_in_at would be set
  Kubernetes Helm Chart Install docs
  Add Repository subnav to 'Find files'
  Make tree, blob and blame pages more consistent
  Add screenshots to Triggered Build docs
  Add Prometheus memory sparkline to MR widget
  Fix test failure in job vue componenFix test failure in job vue componentt
  Remove unnecessary if check
  Fix links in code review docs
  Improve readability of code
  Remove some unused Gitlab::Git code
  Use Rails 'delegate'
  Remove CI/CD models directory from `eager_load_paths`
  Don't make Commit#raw_deltas private
  ...

1 files changed, 4 insertions, 4 deletions

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 44c7eb86855..207fbad7856 100755
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -410,10 +410,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController
 
           metrics_url =
             if can?(current_user, :read_environment, environment) && environment.has_metrics?
-              metrics_namespace_project_environment_path(environment.project.namespace,
-                                                         environment.project,
-                                                         environment,
-                                                         deployment)
+              metrics_namespace_project_environment_deployment_path(environment.project.namespace,
+                                                                    environment.project,
+                                                                    environment,
+                                                                    deployment)
             end
 
           {