Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import

This commit is contained in:
James Lopez
2016-03-11 11:25:20 +01:00
+5 -1
View File
@@ -11,11 +11,15 @@ module Projects
end
def project_tree
%i(project_members issues merge_requests labels milestones snippets releases events commit_statuses)
%i(issues merge_requests labels milestones snippets releases events commit_statuses) + members
end
private
def members
[{ project_members: { include: [user: { only: [:email, :username] }] } }]
end
def storage_path
File.join(Settings.shared['path'], 'tmp/project_exports')
end