summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/import_export/reader_spec.rb
diff options
context:
space:
mode:
authorRuben Davila <rdavila84@gmail.com>2016-08-16 12:24:03 -0500
committerRuben Davila <rdavila84@gmail.com>2016-08-16 12:24:03 -0500
commit7f853e2245eff92c037af5e007163d3e9631888d (patch)
treef235958bee27285654db1d5e71c30a500bb08c6a /spec/lib/gitlab/import_export/reader_spec.rb
parent07d5759408000ff46088ad886df149e21faf676f (diff)
parent9ef8de2fb7c0fca8014594c90bc199f11f92402d (diff)
downloadgitlab-ce-7f853e2245eff92c037af5e007163d3e9631888d.tar.gz
Merge remote-tracking branch 'dev/master'
Diffstat (limited to 'spec/lib/gitlab/import_export/reader_spec.rb')
-rw-r--r--spec/lib/gitlab/import_export/reader_spec.rb3
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