From ce48a595b04ba682409dd55a6272c8dd9a8553f3 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Wed, 21 Sep 2016 13:01:46 +0200
Subject: fixing security specs after merge

---
 spec/features/projects/import_export/export_file_spec.rb |  2 +-
 spec/lib/gitlab/import_export/all_models.yml             |  8 ++++++++
 spec/lib/gitlab/import_export/safe_model_attributes.yml  | 15 ++++++++++++++-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/spec/features/projects/import_export/export_file_spec.rb b/spec/features/projects/import_export/export_file_spec.rb
index 7e2c701e401..27c986c5187 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 30968ba2d5f..2d8d1bb441c 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 f2d272ca7e2..7efe14545b5 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
-- 
cgit v1.2.1