James Lopez
|
6f0c503397
|
Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
|
2016-06-13 13:44:00 +02:00 |
|
James Lopez
|
86e4751011
|
fixed deprecation warning
|
2016-06-13 13:42:30 +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 |