diff options
author | Timothy Andrew <mail@timothyandrew.net> | 2016-08-16 23:51:22 +0530 |
---|---|---|
committer | Timothy Andrew <mail@timothyandrew.net> | 2016-08-16 23:51:22 +0530 |
commit | d9efc7d9e6eb0b8247226c2fe2e929598f297056 (patch) | |
tree | 4b7347e8c462d65b12c87a2292d7879ee44fbaf2 /spec/lib/gitlab/import_export/reader_spec.rb | |
parent | 8c101fc313208b2256f9b9a2d596a0b398f173e0 (diff) | |
parent | 7f853e2245eff92c037af5e007163d3e9631888d (diff) | |
download | gitlab-ce-d9efc7d9e6eb0b8247226c2fe2e929598f297056.tar.gz |
Merge remote-tracking branch 'origin/master' into ee-581-backport-changesee-581-backport-changes
Diffstat (limited to 'spec/lib/gitlab/import_export/reader_spec.rb')
-rw-r--r-- | spec/lib/gitlab/import_export/reader_spec.rb | 3 |
1 files changed, 2 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 |