fixing merge issues

21be0cae · James Lopez · 7ff2a51e · 21be0cae · 21be0cae
Commit 21be0cae authored May 09, 2016 by James Lopez
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

lib/gitlab/import_export.rb lib/gitlab/import_export.rb +0 -4

lib/gitlab/import_export/import_export.yml lib/gitlab/import_export/import_export.yml +0 -1

No files found.
--- a/lib/gitlab/import_export.rb
+++ b/lib/gitlab/import_export.rb
@@ -6,10 +6,6 @@ module Gitlab
      File.join(storage_path, relative_path)
    end

-    def project_attributes
-      %i(name path description issues_enabled wall_enabled merge_requests_enabled wiki_enabled snippets_enabled visibility_level archived)
-    end
-
    def project_tree
      Gitlab::ImportExport::ImportExportReader.new.project_tree
    end

--- a/lib/gitlab/import_export/import_export.yml
+++ b/lib/gitlab/import_export/import_export.yml
@@ -22,7 +22,6 @@ included_attributes:
    - :path
    - :description
    - :issues_enabled
-    - :wall_enabled
    - :merge_requests_enabled
    - :wiki_enabled
    - :snippets_enabled