Remove fast_destroy_uploads feature flag

Fast destroy of uploads was successfully enabled and test.

1 files changed, 4 insertions, 30 deletions

diff --git a/app/models/concerns/with_uploads.rb b/app/models/concerns/with_uploads.rb
index d79c0eae77e..6c6febd186c 100644
--- a/app/models/concerns/with_uploads.rb
+++ b/app/models/concerns/with_uploads.rb
@@ -27,40 +27,14 @@ module WithUploads
 
   included do
     has_many :uploads, as: :model
-    has_many :file_uploads, -> { where(uploader: FILE_UPLOADERS) }, class_name: 'Upload', as: :model
+    has_many :file_uploads, -> { where(uploader: FILE_UPLOADERS) },
+      class_name: 'Upload', as: :model,
+      dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent
 
-    # TODO: when feature flag is removed, we can use just dependent: destroy
-    # option on :file_uploads
-    before_destroy :remove_file_uploads
-
-    use_fast_destroy :file_uploads, if: :fast_destroy_enabled?
+    use_fast_destroy :file_uploads
   end
 
   def retrieve_upload(_identifier, paths)
     uploads.find_by(path: paths)
   end
-
-  private
-
-  # mounted uploads are deleted in carrierwave's after_commit hook,
-  # but FileUploaders which are not mounted must be deleted explicitly and
-  # it can not be done in after_commit because FileUploader requires loads
-  # associated model on destroy (which is already deleted in after_commit)
-  def remove_file_uploads
-    fast_destroy_enabled? ? delete_uploads : destroy_uploads
-  end
-
-  def delete_uploads
-    file_uploads.delete_all(:delete_all)
-  end
-
-  def destroy_uploads
-    file_uploads.find_each do |upload|
-      upload.destroy
-    end
-  end
-
-  def fast_destroy_enabled?
-    Feature.enabled?(:fast_destroy_uploads, self)
-  end
 end