James Lopez d607046df3 fix merge conflicts

2016-05-10 11:56:13 +02:00

..

attributes_finder.rb

new line missing

2016-05-09 16:19:07 +00:00

command_line_util.rb

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

2016-05-06 14:45:15 +02:00

import_export_reader.rb

renaming variable

2016-05-09 18:40:31 +02:00

import_export.yml

fixing merge issues

2016-05-09 18:33:48 +02:00

import_service.rb

handling errors a bit better on import failure

2016-05-05 18:12:24 +02:00

importer.rb

picking stuff from ui related to import

2016-05-03 12:41:23 +02:00

members_mapper.rb

refactored import stuff, moved to lib

2016-04-14 17:10:57 +02:00

project_factory.rb

refactored some namespace stuff and fixed project tree restorer spec. also removing controller so that it belongs to the UI MR

2016-05-04 17:42:02 +02:00

project_tree_restorer.rb

few fixes to import specs and code

2016-05-06 15:18:25 +02:00

project_tree_saver.rb

fixed and refactored a few things based on MR feedback

2016-05-06 13:40:02 +02:00

relation_factory.rb

refactored import stuff, moved to lib

2016-04-14 17:10:57 +02:00

repo_bundler.rb

update repo and wiki repo bundler to use git bundle instead of compressing via tar

2016-05-05 12:01:18 +02:00

repo_restorer.rb

more fixes - restoring repo

2016-05-05 14:21:27 +02:00

saver.rb

picking export stuff from the UI branch

2016-05-03 11:13:10 +02:00

shared.rb

refactored stuff, added a save and compress all class and moved mostly everything to lib

2016-04-14 16:57:25 +02:00

wiki_repo_bundler.rb

update repo and wiki repo bundler to use git bundle instead of compressing via tar

2016-05-05 12:01:18 +02:00