From ad62a25e0f5b2e35b7101024982139997633768d Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Wed, 21 Sep 2016 20:43:29 +0200
Subject: [PATCH] fix import/export security specs after merge

---
 lib/gitlab/import_export/import_export.yml              | 3 +++
 spec/lib/gitlab/import_export/all_models.yml            | 6 +++++-
 spec/lib/gitlab/import_export/safe_model_attributes.yml | 7 +++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml
index 925a952156f..88803d76623 100644
--- a/lib/gitlab/import_export/import_export.yml
+++ b/lib/gitlab/import_export/import_export.yml
@@ -10,6 +10,7 @@ project_tree:
     - milestone:
       - :events
   - snippets:
+    - :award_emoji
     - notes:
         :author
   - :releases
@@ -66,6 +67,8 @@ excluded_attributes:
     - :milestone_id
   merge_requests:
     - :milestone_id
+  award_emoji:
+    - :awardable_id
 
 methods:
   statuses:
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index 2d8d1bb441c..006569254a6 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -49,6 +49,7 @@ snippets:
 - author
 - project
 - notes
+- award_emoji
 releases:
 - project
 project_members:
@@ -180,4 +181,7 @@ project:
 - triggers
 - environments
 - deployments
-- project_feature
\ No newline at end of file
+- project_feature
+award_emoji:
+- awardable
+- user
\ No newline at end of file
diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml
index 7efe14545b5..8bccd313d6c 100644
--- a/spec/lib/gitlab/import_export/safe_model_attributes.yml
+++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml
@@ -321,3 +321,10 @@ ProtectedBranch::PushAccessLevel:
 - access_level
 - created_at
 - updated_at
+AwardEmoji:
+- id
+- user_id
+- name
+- awardable_type
+- created_at
+- updated_at