Merge branch 'master' into issue_60515issue_60515

3 files changed, 2 insertions, 7 deletions

diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb
index e002a4d349b..ae46a234aa6 100644
--- a/app/controllers/projects/environments_controller.rb
+++ b/app/controllers/projects/environments_controller.rb
@@ -13,7 +13,6 @@ class Projects::EnvironmentsController < Projects::ApplicationController
   before_action only: [:metrics, :additional_metrics, :metrics_dashboard] do
     push_frontend_feature_flag(:environment_metrics_use_prometheus_endpoint)
     push_frontend_feature_flag(:environment_metrics_show_multiple_dashboards)
-    push_frontend_feature_flag(:grafana_dashboard_link)
     push_frontend_feature_flag(:prometheus_computed_alerts)
   end
 
@@ -165,7 +164,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
     if Feature.enabled?(:environment_metrics_show_multiple_dashboards, project)
       result = dashboard_finder.find(project, current_user, environment, params[:dashboard])
 
-      result[:all_dashboards] = project.repository.metrics_dashboard_paths
+      result[:all_dashboards] = dashboard_finder.find_all_paths(project)
     else
       result = dashboard_finder.find(project, current_user, environment)
     end
diff --git a/app/controllers/projects/registry/tags_controller.rb b/app/controllers/projects/registry/tags_controller.rb
index 567d750caae..bf1d8d8b5fc 100644
--- a/app/controllers/projects/registry/tags_controller.rb
+++ b/app/controllers/projects/registry/tags_controller.rb
@@ -3,7 +3,7 @@
 module Projects
   module Registry
     class TagsController < ::Projects::Registry::ApplicationController
-      before_action :authorize_update_container_image!, only: [:destroy]
+      before_action :authorize_destroy_container_image!, only: [:destroy]
 
       def index
         respond_to do |format|
diff --git a/app/controllers/projects/settings/operations_controller.rb b/app/controllers/projects/settings/operations_controller.rb
index b5c77e5bbf4..5cfb0ac307d 100644
--- a/app/controllers/projects/settings/operations_controller.rb
+++ b/app/controllers/projects/settings/operations_controller.rb
@@ -5,10 +5,6 @@ module Projects
     class OperationsController < Projects::ApplicationController
       before_action :authorize_update_environment!
 
-      before_action do
-        push_frontend_feature_flag(:grafana_dashboard_link)
-      end
-
       helper_method :error_tracking_setting
 
       def show