diff options
| author | Felipe Artur <felipefac@gmail.com> | 2019-02-15 14:37:55 -0200 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2019-02-15 14:37:55 -0200 |
| commit | bf99ce7bf8bf4bda75ca57f5db4d216f3585615a (patch) | |
| tree | 307f2980269ef02e525df9236832cd39cf8b17e1 | |
| parent | 7b79f6ab0d342e335609a7f3eb6cb691d1f03111 (diff) | |
| download | gitlab-ce-bf99ce7bf8bf4bda75ca57f5db4d216f3585615a.tar.gz | |
Fix specs
| -rw-r--r-- | spec/db/schema_spec.rb | 4 | ||||
| -rw-r--r-- | spec/lib/gitlab/import_export/safe_model_attributes.yml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/spec/db/schema_spec.rb b/spec/db/schema_spec.rb index 897b4411055..40c3a6d90d0 100644 --- a/spec/db/schema_spec.rb +++ b/spec/db/schema_spec.rb @@ -25,12 +25,12 @@ describe 'Database schema' do events: %w[target_id], forked_project_links: %w[forked_from_project_id], identities: %w[user_id], - issues: %w[last_edited_by_id], + issues: %w[last_edited_by_id state_id], keys: %w[user_id], label_links: %w[target_id], lfs_objects_projects: %w[lfs_object_id project_id], members: %w[source_id created_by_id], - merge_requests: %w[last_edited_by_id], + merge_requests: %w[last_edited_by_id state_id], namespaces: %w[owner_id parent_id], notes: %w[author_id commit_id noteable_id updated_by_id resolved_by_id discussion_id], notification_settings: %w[source_id], diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml index baca8f6d542..9cfa29ca7d9 100644 --- a/spec/lib/gitlab/import_export/safe_model_attributes.yml +++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml @@ -11,6 +11,7 @@ Issue: - branch_name - description - state +- state_id - iid - updated_by_id - confidential @@ -158,6 +159,7 @@ MergeRequest: - created_at - updated_at - state +- state_id - merge_status - target_project_id - iid |