Commit graph

9 commits

Author SHA1 Message Date
Grzegorz Bizon
9e211091a8 Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
James Lopez
9ff1990422 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-06-14 10:18:03 +02:00
James Lopez
bd5c749f29 fix file.write 2016-06-13 18:24:21 +02:00
James Lopez
ad68bc63b5 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
# Conflicts:
#	app/models/project.rb
#	db/schema.rb
#	lib/gitlab/import_export/import_export_reader.rb
2016-06-13 12:43:25 +02:00
James Lopez
9d0038f2d7 started refactoring a bunch of stuff based on feedback 2016-06-03 12:56:29 +02:00
James Lopez
bd5b019a7c Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-16 13:29:25 +02:00
James Lopez
504c186f71 fix version issue 2016-05-16 13:28:11 +02:00
James Lopez
51487575bc added version check on import 2016-05-16 12:39:42 +02:00
James Lopez
5777ad9a1f adding versioning to export 2016-05-16 12:04:31 +02:00