diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-08-15 19:55:02 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-08-15 19:55:02 +0000 |
| commit | 9ef8de2fb7c0fca8014594c90bc199f11f92402d (patch) | |
| tree | 10b80653398180b06adeda19fe737ea23d4284cf /spec | |
| parent | 966b303802e12204f5d32af24b13bd0ceb5342a1 (diff) | |
| parent | c42f5f8b56a919473d9adceaf84c9ef77179c5cb (diff) | |
| download | gitlab-ce-9ef8de2fb7c0fca8014594c90bc199f11f92402d.tar.gz | |
Merge branch 'fix/export-att-inclusion' into 'master'
Fix attribute inclusion import/export config ignored in some cases
In the `import_export.yml` file we define the inclusion of some of the attributes. For some reason, this isn't working in certain cases - very unfortunate this includes `user`. This has been introduced in 8.10.3.
Related https://gitlab.com/gitlab-org/gitlab-ce/issues/20802
See merge request !1982
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/lib/gitlab/import_export/reader_spec.rb | 3 | ||||
| -rw-r--r-- | spec/support/import_export/import_export.yml | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/spec/lib/gitlab/import_export/reader_spec.rb b/spec/lib/gitlab/import_export/reader_spec.rb index b76e14deca1..b6dec41d218 100644 --- a/spec/lib/gitlab/import_export/reader_spec.rb +++ b/spec/lib/gitlab/import_export/reader_spec.rb @@ -12,7 +12,8 @@ describe Gitlab::ImportExport::Reader, lib: true do except: [:iid], include: [:merge_request_diff, :merge_request_test] } }, - { commit_statuses: { include: :commit } }] + { commit_statuses: { include: :commit } }, + { project_members: { include: { user: { only: [:email] } } } }] } end diff --git a/spec/support/import_export/import_export.yml b/spec/support/import_export/import_export.yml index 3ceec506401..17136dee000 100644 --- a/spec/support/import_export/import_export.yml +++ b/spec/support/import_export/import_export.yml @@ -7,6 +7,8 @@ project_tree: - :merge_request_test - commit_statuses: - :commit + - project_members: + - :user included_attributes: project: @@ -14,6 +16,8 @@ included_attributes: - :path merge_requests: - :id + user: + - :email excluded_attributes: merge_requests: |