diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 18:07:52 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 18:07:52 +0300 |
| commit | afe2b984524ae4b0c8a0636db7ec5b2c452f0734 (patch) | |
| tree | 3de39f954c7239e09a9afe84263a64e7042b2b60 /lib/gitlab/import_export | |
| parent | 5a6b36b60502c50ab59c0bc3c345793b70a3d548 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/import_export')
| -rw-r--r-- | lib/gitlab/import_export/project/tree_restorer.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/gitlab/import_export/project/tree_restorer.rb b/lib/gitlab/import_export/project/tree_restorer.rb index 904cb461ac3..295e0d5f348 100644 --- a/lib/gitlab/import_export/project/tree_restorer.rb +++ b/lib/gitlab/import_export/project/tree_restorer.rb @@ -43,10 +43,7 @@ module Gitlab def read_tree_hash path = File.join(@shared.export_path, 'project.json') - dedup_entries = large_project?(path) && - Feature.enabled?(:dedup_project_import_metadata, project.group) - - @tree_loader.load(path, dedup_entries: dedup_entries) + @tree_loader.load(path, dedup_entries: large_project?(path)) rescue => e Rails.logger.error("Import/Export error: #{e.message}") # rubocop:disable Gitlab/RailsLogger raise Gitlab::ImportExport::Error.new('Incorrect JSON format') |