diff options
| author | James Lopez <james@jameslopez.es> | 2016-09-21 21:43:29 +0300 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-09-21 23:47:11 +0300 |
| commit | ad62a25e0f5b2e35b7101024982139997633768d (patch) | |
| tree | 10a4b73acc142385cf261808539cf55a4a7166f0 /spec | |
| parent | 4e7eb30923ee06248648e4ec7fd37ca40fc9fa8d (diff) | |
fix import/export security specs after merge
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/lib/gitlab/import_export/all_models.yml | 6 | ||||
| -rw-r--r-- | spec/lib/gitlab/import_export/safe_model_attributes.yml | 7 |
2 files changed, 12 insertions, 1 deletions
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 |