Merge branches 'feature/project-export' and 'feature/project-import' of…

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

Merge branches 'feature/project-export' and 'feature/project-import' of…
c2304141 · James Lopez · 3f479edd · 2fd30231 · c2304141
Commit c2304141 authored Mar 11, 2016 by James Lopez
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

import_export.rb app/services/projects/import_export.rb +2 -2

No files found.
--- a/app/services/projects/import_export.rb
+++ b/app/services/projects/import_export.rb
@@ -7,11 +7,11 @@ module Projects
    end

    def project_atts
-      %i(project_members name path description issues_enabled wall_enabled merge_requests_enabled wiki_enabled snippets_enabled visibility_level archived)
+      %i(name path description issues_enabled wall_enabled merge_requests_enabled wiki_enabled snippets_enabled visibility_level archived)
    end

    def project_tree
-      %i(issues merge_requests labels milestones snippets releases events commit_statuses)
+      %i(project_members issues merge_requests labels milestones snippets releases events commit_statuses)
    end

    private