Commit e5a97a87 authored by Stan Hu's avatar Stan Hu

Merge branch 'georgekoltsov/enable-decompressed-archive-validation-by-default' into 'master'

Enable validate_import_decompressed_archive_size feature flag by default

See merge request gitlab-org/gitlab!63025
parents 77dee58e a180695a
...@@ -16,7 +16,7 @@ module BulkImports ...@@ -16,7 +16,7 @@ module BulkImports
def execute def execute
validate_dir validate_dir
validate_decompressed_file_size if Feature.enabled?(:validate_import_decompressed_archive_size) validate_decompressed_file_size if Feature.enabled?(:validate_import_decompressed_archive_size, default_enabled: :yaml)
validate_symlink(filepath) validate_symlink(filepath)
decompress_file decompress_file
......
...@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/282245 ...@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/282245
milestone: '13.4' milestone: '13.4'
type: development type: development
group: group::import group: group::import
default_enabled: false default_enabled: true
...@@ -7,7 +7,8 @@ type: reference, howto ...@@ -7,7 +7,8 @@ type: reference, howto
# Project Import Decompressed Archive Size Limits # Project Import Decompressed Archive Size Limits
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/31564) in GitLab 13.2. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/31564) in GitLab 13.2.
> - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63025) in GitLab 14.0.
When using [Project Import](../user/project/settings/import_export.md), the size of the decompressed project archive is limited to 10Gb. When using [Project Import](../user/project/settings/import_export.md), the size of the decompressed project archive is limited to 10Gb.
...@@ -15,7 +16,6 @@ If decompressed size exceeds this limit, `Decompressed archive size validation f ...@@ -15,7 +16,6 @@ If decompressed size exceeds this limit, `Decompressed archive size validation f
## Enable/disable size validation ## Enable/disable size validation
Decompressed size validation is enabled by default.
If you have a project with decompressed size exceeding this limit, If you have a project with decompressed size exceeding this limit,
it is possible to disable the validation by turning off the it is possible to disable the validation by turning off the
`validate_import_decompressed_archive_size` feature flag. `validate_import_decompressed_archive_size` feature flag.
......
...@@ -28,9 +28,7 @@ module Gitlab ...@@ -28,9 +28,7 @@ module Gitlab
copy_archive copy_archive
wait_for_archived_file do wait_for_archived_file do
# Disable archive validation by default validate_decompressed_archive_size if Feature.enabled?(:validate_import_decompressed_archive_size, default_enabled: :yaml)
# See: https://gitlab.com/gitlab-org/gitlab/-/issues/235949
validate_decompressed_archive_size if Feature.enabled?(:validate_import_decompressed_archive_size)
decompress_archive decompress_archive
end end
rescue StandardError => e rescue StandardError => e
......
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