diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 12:16:11 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 12:16:11 +0300 |
| commit | edaa33dee2ff2f7ea3fac488d41558eb5f86d68c (patch) | |
| tree | 11f143effbfeba52329fb7afbd05e6e2a3790241 /lib/gitlab/import_export | |
| parent | d8a5691316400a0f7ec4f83832698f1988eb27c1 (diff) | |
Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42
Diffstat (limited to 'lib/gitlab/import_export')
| -rw-r--r-- | lib/gitlab/import_export/base/relation_factory.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/import_export/group/relation_tree_restorer.rb | 10 | ||||
| -rw-r--r-- | lib/gitlab/import_export/project/import_export.yml | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/lib/gitlab/import_export/base/relation_factory.rb b/lib/gitlab/import_export/base/relation_factory.rb index 6749ef4e276..8a8c74c302d 100644 --- a/lib/gitlab/import_export/base/relation_factory.rb +++ b/lib/gitlab/import_export/base/relation_factory.rb @@ -196,7 +196,7 @@ module Gitlab end def use_attributes_permitter? - Feature.enabled?(:permitted_attributes_for_import_export, default_enabled: :yaml) + true end def existing_or_new_object diff --git a/lib/gitlab/import_export/group/relation_tree_restorer.rb b/lib/gitlab/import_export/group/relation_tree_restorer.rb index cbc8ee9e18b..c2cbd2fdf47 100644 --- a/lib/gitlab/import_export/group/relation_tree_restorer.rb +++ b/lib/gitlab/import_export/group/relation_tree_restorer.rb @@ -118,7 +118,7 @@ module Gitlab end def filter_attributes(params) - if use_attributes_permitter? && attributes_permitter.permitted_attributes_defined?(importable_class_sym) + if attributes_permitter.permitted_attributes_defined?(importable_class_sym) attributes_permitter.permit(importable_class_sym, params) else Gitlab::ImportExport::AttributeCleaner.clean( @@ -132,10 +132,6 @@ module Gitlab @attributes_permitter ||= Gitlab::ImportExport::AttributesPermitter.new end - def use_attributes_permitter? - Feature.enabled?(:permitted_attributes_for_import_export, default_enabled: :yaml) - end - def present_override_params # we filter out the empty strings from the overrides # keeping the default values configured @@ -264,14 +260,12 @@ module Gitlab @relation_reader.sort_ci_pipelines_by_id end - # Enable logging of each top-level relation creation when Importing - # into a Group if feature flag is enabled + # Enable logging of each top-level relation creation when Importing into a Group def log_relation_creation(importable, relation_key, relation_object) root_ancestor_group = importable.try(:root_ancestor) return unless root_ancestor_group return unless root_ancestor_group.instance_of?(::Group) - return unless Feature.enabled?(:log_import_export_relation_creation, root_ancestor_group) @shared.logger.info( importable_type: importable.class.to_s, diff --git a/lib/gitlab/import_export/project/import_export.yml b/lib/gitlab/import_export/project/import_export.yml index ef146359da9..059f6bd42e3 100644 --- a/lib/gitlab/import_export/project/import_export.yml +++ b/lib/gitlab/import_export/project/import_export.yml @@ -120,6 +120,7 @@ included_attributes: - :name ci_cd_settings: - :group_runners_enabled + - :runner_token_expiration_interval metrics_setting: - :dashboard_timezone - :external_dashboard_url @@ -904,6 +905,7 @@ excluded_attributes: - :release_id project_members: - :source_id + - :member_namespace_id - :invite_email_success - :state group_members: |