Commit 36116b57 authored by Markus Koller's avatar Markus Koller

Merge branch 'ld-remove-export_lfs_objects_projects-flag' into 'master'

Remove export_lfs_objects_projects feature flag

See merge request gitlab-org/gitlab!43206
parents 9c310b79 36d1d47f
---
name: export_lfs_objects_projects
introduced_by_url:
rollout_issue_url:
group:
type: development
default_enabled: true
...@@ -21,10 +21,10 @@ module Gitlab ...@@ -21,10 +21,10 @@ module Gitlab
save_lfs_object(lfs_object) save_lfs_object(lfs_object)
end end
append_lfs_json_for_batch(batch) if write_lfs_json_enabled? append_lfs_json_for_batch(batch)
end end
write_lfs_json if write_lfs_json_enabled? write_lfs_json
true true
rescue => e rescue => e
...@@ -35,10 +35,6 @@ module Gitlab ...@@ -35,10 +35,6 @@ module Gitlab
private private
def write_lfs_json_enabled?
::Feature.enabled?(:export_lfs_objects_projects, default_enabled: true)
end
def save_lfs_object(lfs_object) def save_lfs_object(lfs_object)
if lfs_object.local_store? if lfs_object.local_store?
copy_file_for_lfs_object(lfs_object) copy_file_for_lfs_object(lfs_object)
......
...@@ -74,14 +74,6 @@ RSpec.describe Gitlab::ImportExport::LfsSaver do ...@@ -74,14 +74,6 @@ RSpec.describe Gitlab::ImportExport::LfsSaver do
} }
) )
end end
it 'does not save a json file if feature is disabled' do
stub_feature_flags(export_lfs_objects_projects: false)
saver.save
expect(File.exist?(lfs_json_file)).to eq(false)
end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment