Add latest changes from gitlab-org/gitlab@12-5-stable-ee

1 files changed, 2 insertions, 5 deletions

diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb
index c053ca19a94..4562296cea0 100644
--- a/app/controllers/projects/environments_controller.rb
+++ b/app/controllers/projects/environments_controller.rb
@@ -13,8 +13,6 @@ class Projects::EnvironmentsController < Projects::ApplicationController
   before_action :verify_api_request!, only: :terminal_websocket_authorize
   before_action :expire_etag_cache, only: [:index]
   before_action only: [:metrics, :additional_metrics, :metrics_dashboard] do
-    push_frontend_feature_flag(:environment_metrics_use_prometheus_endpoint, default_enabled: true)
-    push_frontend_feature_flag(:environment_metrics_additional_panel_types)
     push_frontend_feature_flag(:prometheus_computed_alerts)
   end
 
@@ -133,7 +131,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
     if environment
       redirect_to environment_metrics_path(environment)
     else
-      render :empty
+      render :empty_metrics
     end
   end
 
@@ -199,8 +197,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
 
   def metrics_dashboard_params
     params
-      .permit(:embedded, :group, :title, :y_label)
-      .to_h.symbolize_keys
+      .permit(:embedded, :group, :title, :y_label, :dashboard_path, :environment)
       .merge(dashboard_path: params[:dashboard], environment: environment)
   end