summaryrefslogtreecommitdiff
path: root/app/services
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-03-14 12:29:46 +0100
committerJames Lopez <james@jameslopez.es>2016-03-14 12:29:46 +0100
commitba1fcf36197b86049b5e6a0f2da8842b236bcf62 (patch)
tree2b48096cfd38ec344c432309f659db13cfb70575 /app/services
parent5fbcfab63f8cb026ac239feabdd59de65d1cb5d9 (diff)
downloadgitlab-ce-ba1fcf36197b86049b5e6a0f2da8842b236bcf62.tar.gz
added commits and merge request diffs to export
Diffstat (limited to 'app/services')
-rw-r--r--app/services/projects/import_export.rb12
1 files changed, 10 insertions, 2 deletions
diff --git a/app/services/projects/import_export.rb b/app/services/projects/import_export.rb
index b0c0891edb5..373916a0c4c 100644
--- a/app/services/projects/import_export.rb
+++ b/app/services/projects/import_export.rb
@@ -11,13 +11,21 @@ module Projects
end
def project_tree
- %i(issues merge_requests labels milestones snippets releases events commit_statuses) + members
+ %i(issues labels milestones snippets releases events) + [members, merge_requests, commit_statuses]
end
private
+ def merge_requests
+ { merge_requests: { include: :merge_request_diff } }
+ end
+
+ def commit_statuses
+ { commit_statuses: { include: :commit } }
+ end
+
def members
- [{ project_members: { include: [user: { only: [:id, :email, :username] }] } }]
+ { project_members: { include: [user: { only: [:id, :email, :username] }] } }
end
def storage_path