diff options
author | Ruben Davila <rdavila84@gmail.com> | 2016-08-16 12:24:03 -0500 |
---|---|---|
committer | Ruben Davila <rdavila84@gmail.com> | 2016-08-16 12:24:03 -0500 |
commit | 7f853e2245eff92c037af5e007163d3e9631888d (patch) | |
tree | f235958bee27285654db1d5e71c30a500bb08c6a /spec/lib/gitlab/import_export/reader_spec.rb | |
parent | 07d5759408000ff46088ad886df149e21faf676f (diff) | |
parent | 9ef8de2fb7c0fca8014594c90bc199f11f92402d (diff) | |
download | gitlab-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.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 |