diff --git a/lib/gitlab/import_export/project/import_export.yml b/lib/gitlab/import_export/project/import_export.yml index ae5c6f14d96e10c9b7ca5dc7676f48d525a06a2d..c6982ce8ed0abffb27dc3266cb7ba73498dcd241 100644 --- a/lib/gitlab/import_export/project/import_export.yml +++ b/lib/gitlab/import_export/project/import_export.yml @@ -778,7 +778,6 @@ included_attributes: - :merge_commit_template - :squash_commit_template - :max_artifacts_size - - :enabled_foundational_flows resource_milestone_events: - :user_id - :action @@ -1337,6 +1336,7 @@ ee: project: - :requirements_enabled - :requirements_access_level + - :enabled_foundational_flows resource_iteration_events: - :user_id - :action diff --git a/spec/lib/gitlab/import_export/attributes_permitter_spec.rb b/spec/lib/gitlab/import_export/attributes_permitter_spec.rb index 662230ba03a7acb9c078757200af0ee5bbb7c016..7036905f41db8f4f216f9fe26fe9fe595e211895 100644 --- a/spec/lib/gitlab/import_export/attributes_permitter_spec.rb +++ b/spec/lib/gitlab/import_export/attributes_permitter_spec.rb @@ -172,10 +172,7 @@ } Gitlab::ImportExport::Config.new.to_h[:included_attributes].each do |relation_sym, permitted_attributes| - context "for #{relation_sym}", quarantine: { - type: :broken, - issue: 'https://gitlab.com/gitlab-org/quality/engineering-productivity/master-broken-incidents/-/issues/19640' - } do + context "for #{relation_sym}" do it_behaves_like 'a permitted attribute', relation_sym, permitted_attributes, additional_attributes[relation_sym] end end