diff --git a/spec/features/projects/import_export/export_file_spec.rb b/spec/features/projects/import_export/export_file_spec.rb index 7e2c701e401ac54b6d32d598a04bf7dec36f1a1a..27c986c5187e0f4f176bfb7baa609d11cfc984ee 100644 --- a/spec/features/projects/import_export/export_file_spec.rb +++ b/spec/features/projects/import_export/export_file_spec.rb @@ -15,7 +15,7 @@ feature 'Import/Export - project export integration test', feature: true, js: tr let(:sensitive_words) { %w[pass secret token key] } let(:safe_list) do { - token: [ProjectHook, Ci::Trigger], + token: [ProjectHook, Ci::Trigger, CommitStatus], key: [Project, Ci::Variable, :yaml_variables] } end diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml index 30968ba2d5ff72944ea8b759690ab9acf7ca76c6..2d8d1bb441cc9389c47cde76cfd587922647cac4 100644 --- a/spec/lib/gitlab/import_export/all_models.yml +++ b/spec/lib/gitlab/import_export/all_models.yml @@ -13,6 +13,8 @@ issues: - user_agent_detail - moved_to - events +- merge_requests_closing_issues +- metrics events: - author - project @@ -71,6 +73,8 @@ merge_requests: - merge_request_diffs - merge_request_diff - events +- merge_requests_closing_issues +- metrics merge_request_diff: - merge_request pipelines: @@ -101,6 +105,10 @@ protected_branches: - project - merge_access_levels - push_access_levels +merge_access_levels: +- protected_branch +push_access_levels: +- protected_branch project: - taggings - base_tags diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml index f2d272ca7e2737c698ce8d5b2387b988f6ee95f8..7efe14545b597ff775785414ba06935c8f8cd6ad 100644 --- a/spec/lib/gitlab/import_export/safe_model_attributes.yml +++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml @@ -214,6 +214,7 @@ CommitStatus: - when - yaml_variables - queued_at +- token Ci::Variable: - id - project_id @@ -307,4 +308,16 @@ ProjectFeature: - snippets_access_level - builds_access_level - created_at -- updated_at \ No newline at end of file +- updated_at +ProtectedBranch::MergeAccessLevel: +- id +- protected_branch_id +- access_level +- created_at +- updated_at +ProtectedBranch::PushAccessLevel: +- id +- protected_branch_id +- access_level +- created_at +- updated_at