Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc32

1 files changed, 2 insertions, 6 deletions

diff --git a/lib/gitlab/import_export/lfs_saver.rb b/lib/gitlab/import_export/lfs_saver.rb
index 515fd98630c..4964b8b16f4 100644
--- a/lib/gitlab/import_export/lfs_saver.rb
+++ b/lib/gitlab/import_export/lfs_saver.rb
@@ -21,10 +21,10 @@ module Gitlab
             save_lfs_object(lfs_object)
           end
 
-          append_lfs_json_for_batch(batch) if write_lfs_json_enabled?
+          append_lfs_json_for_batch(batch)
         end
 
-        write_lfs_json if write_lfs_json_enabled?
+        write_lfs_json
 
         true
       rescue => e
@@ -35,10 +35,6 @@ module Gitlab
 
       private
 
-      def write_lfs_json_enabled?
-        ::Feature.enabled?(:export_lfs_objects_projects, default_enabled: true)
-      end
-
       def save_lfs_object(lfs_object)
         if lfs_object.local_store?
           copy_file_for_lfs_object(lfs_object)