1 files changed, 6 insertions, 10 deletions
diff --git a/app/models/ci/job_artifact.rb b/app/models/ci/job_artifact.rb
index e6dd62fab34..3426c4d5248 100644
--- a/app/models/ci/job_artifact.rb
+++ b/app/models/ci/job_artifact.rb
@@ -181,9 +181,7 @@ module Ci
     end
 
     scope :erasable, -> do
-      types = self.file_types.reject { |file_type| NON_ERASABLE_FILE_TYPES.include?(file_type) }.values
-
-      where(file_type: types)
+      where(file_type: self.erasable_file_types)
     end
 
     scope :downloadable, -> { where(file_type: DOWNLOADABLE_TYPES) }
@@ -263,6 +261,10 @@ module Ci
       [file_type]
     end
 
+    def self.erasable_file_types
+      self.file_types.keys - NON_ERASABLE_FILE_TYPES
+    end
+
     def self.total_size
       self.sum(:size)
     end
@@ -271,10 +273,6 @@ module Ci
       self.where(project: project).sum(:size)
     end
 
-    def self.distinct_job_ids
-      distinct.pluck(:job_id)
-    end
-
     ##
     # FastDestroyAll concerns
     # rubocop: disable CodeReuse/ServiceClass
@@ -350,9 +348,7 @@ module Ci
 
     def store_after_commit?
       strong_memoize(:store_after_commit) do
-        trace? &&
-          JobArtifactUploader.direct_upload_enabled? &&
-          Feature.enabled?(:ci_store_trace_outside_transaction, project, default_enabled: :yaml)
+        trace? && JobArtifactUploader.direct_upload_enabled?
       end
     end