fixing merge issues
This commit is contained in:
parent
7ff2a51eb2
commit
21be0cae62
|
@ -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
|
||||
|
|
|
@ -22,7 +22,6 @@ included_attributes:
|
|||
- :path
|
||||
- :description
|
||||
- :issues_enabled
|
||||
- :wall_enabled
|
||||
- :merge_requests_enabled
|
||||
- :wiki_enabled
|
||||
- :snippets_enabled
|
||||
|
|
Loading…
Reference in New Issue