6 files changed, 3 insertions, 43 deletions
diff --git a/app/serializers/diff_viewer_entity.rb b/app/serializers/diff_viewer_entity.rb
index 8ff9d9612c6..f8d9778a3ee 100644
--- a/app/serializers/diff_viewer_entity.rb
+++ b/app/serializers/diff_viewer_entity.rb
@@ -5,7 +5,7 @@ class DiffViewerEntity < Grape::Entity
   expose :render_error, as: :error
   expose :render_error_message, as: :error_message
   expose :collapsed?, as: :collapsed
-  expose :whitespace_only, if: ->(_, _) { Feature.enabled?(:add_ignore_all_white_spaces) } do |_, options|
+  expose :whitespace_only do |_, options|
     options[:whitespace_only]
   end
 end
diff --git a/app/serializers/environment_entity.rb b/app/serializers/environment_entity.rb
index 6457127d831..0a3bf4c2a7b 100644
--- a/app/serializers/environment_entity.rb
+++ b/app/serializers/environment_entity.rb
@@ -27,10 +27,6 @@ class EnvironmentEntity < Grape::Entity
       ops.merge(except: UNNECESSARY_ENTRIES_FOR_UPCOMING_DEPLOYMENT))
   end
 
-  expose :metrics_path, if: -> (*) { expose_metrics_path? } do |environment|
-    metrics_project_environment_path(environment.project, environment)
-  end
-
   expose :environment_path do |environment|
     project_environment_path(environment.project, environment)
   end
@@ -101,10 +97,6 @@ class EnvironmentEntity < Grape::Entity
   def cluster
     deployment_platform.cluster
   end
-
-  def expose_metrics_path?
-    !Feature.enabled?(:remove_monitor_metrics) && environment.has_metrics?
-  end
 end
 
 EnvironmentEntity.prepend_mod_with('EnvironmentEntity')
diff --git a/app/serializers/environment_status_entity.rb b/app/serializers/environment_status_entity.rb
index 9318e0c1de8..8865c030d94 100644
--- a/app/serializers/environment_status_entity.rb
+++ b/app/serializers/environment_status_entity.rb
@@ -15,10 +15,6 @@ class EnvironmentStatusEntity < Grape::Entity
     metrics_project_environment_deployment_path(es.project, es.environment, es.deployment)
   end
 
-  expose :metrics_monitoring_url, if: ->(*) { can_read_environment? } do |es|
-    project_metrics_dashboard_path(es.project, environment: es.environment)
-  end
-
   expose :stop_url, if: ->(*) { can_stop_environment? } do |es|
     stop_project_environment_path(es.project, es.environment)
   end
diff --git a/app/serializers/lfs_file_lock_entity.rb b/app/serializers/lfs_file_lock_entity.rb
index 7961c4e666b..dd109cba015 100644
--- a/app/serializers/lfs_file_lock_entity.rb
+++ b/app/serializers/lfs_file_lock_entity.rb
@@ -5,9 +5,9 @@ class LfsFileLockEntity < Grape::Entity
 
   expose :path
   expose(:id) { |entity| entity.id.to_s }
-  expose(:created_at, as: :locked_at) { |entity| entity.created_at.to_s(:iso8601) }
+  expose(:created_at, as: :locked_at) { |entity| entity.created_at.to_fs(:iso8601) }
 
   expose :owner do
-    expose(:name) { |entity| entity.user&.name }
+    expose(:name) { |entity| entity.user&.username }
   end
 end
diff --git a/app/serializers/prometheus_alert_entity.rb b/app/serializers/prometheus_alert_entity.rb
deleted file mode 100644
index fb25889e4db..00000000000
--- a/app/serializers/prometheus_alert_entity.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-class PrometheusAlertEntity < Grape::Entity
-  include RequestAwareEntity
-
-  expose :id
-  expose :title
-  expose :query
-  expose :threshold
-  expose :runbook_url
-
-  expose :operator do |prometheus_alert|
-    prometheus_alert.computed_operator
-  end
-
-  private
-
-  alias_method :prometheus_alert, :object
-
-  def can_read_prometheus_alerts?
-    can?(request.current_user, :read_prometheus_alerts, prometheus_alert.project)
-  end
-end
diff --git a/app/serializers/prometheus_alert_serializer.rb b/app/serializers/prometheus_alert_serializer.rb
deleted file mode 100644
index 4dafb7216db..00000000000
--- a/app/serializers/prometheus_alert_serializer.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-class PrometheusAlertSerializer < BaseSerializer
-  entity PrometheusAlertEntity
-end