summaryrefslogtreecommitdiff
path: root/lib/gitlab/import_export
Commit message (Expand)AuthorAgeFilesLines
* Squashed - fix encoding issuefix/import-export-encodingJames Lopez2016-07-192-1/+10
* allow empty repos on import/exportJames Lopez2016-07-184-10/+5
* Merge branch 'fix/project-export-filename' into 'master' Douwe Maan2016-07-151-2/+3
|\
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-exp...fix/project-export-filenameJames Lopez2016-07-151-1/+4
| |\
| * | add project name and namespace to filename on project exportJames Lopez2016-07-151-2/+3
* | | Merge branch 'fix/ee-to-ce-import'Douwe Maan2016-07-151-2/+6
|\ \ \ | |_|/ |/| |
| * | fix EE => CE project import, and updated JSON specJames Lopez2016-07-141-2/+6
| |/
* | fix updated_at not preserved after import - for GitLab projectsJames Lopez2016-07-141-1/+4
|/
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-even...James Lopez2016-07-1112-12/+3
|\
| * fix log statements in import/exportJames Lopez2016-07-072-2/+2
| * fix typofix/project-export-errorJames Lopez2016-07-061-1/+1
| * even more debugJames Lopez2016-07-062-1/+3
| * Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-linesGrzegorz Bizon2016-07-0110-11/+0
* | squashed - refactor to cope with sub sub N relations probably using the sub_r...James Lopez2016-07-111-0/+9
|/
* use has_many relationship with eventsJames Lopez2016-07-011-0/+1
* fixing events for import/exportJames Lopez2016-06-291-5/+10
* Fix tmp file being deleted after the request plus some cleanup and improved e...James Lopez2016-06-242-4/+17
* fix utc errorJames Lopez2016-06-221-1/+3
* fix wiki stuffJames Lopez2016-06-161-2/+1
* lots of refactoring again based on feedback. Changed the UI slightly and also...James Lopez2016-06-152-2/+3
* yay finally importing working with the new services structureJames Lopez2016-06-141-2/+2
* few fixes after refactoring the whole UI stuffJames Lopez2016-06-143-6/+4
* adapted current services stuff to use new project import, plus fixes a few is...James Lopez2016-06-144-33/+21
* Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-06-141-1/+1
|\
| * fix merge issueJames Lopez2016-06-141-1/+1
* | adding notifications stuff and more refactoring for exporting projectsJames Lopez2016-06-141-14/+9
* | new export stuff and viewJames Lopez2016-06-141-1/+1
* | lots of refactoring to reuse import serviceJames Lopez2016-06-146-149/+100
* | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-06-146-9/+8
|\ \ | |/
| * updated relation_factory based on MR feedbackJames Lopez2016-06-141-3/+3
| * fix mergeJames Lopez2016-06-141-1/+1
| * Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-06-144-5/+4
| |\
| | * missed line breakJames Lopez2016-06-141-0/+1
| | * few changes based on MR feedbackJames Lopez2016-06-132-2/+2
| | * fix file.writeJames Lopez2016-06-131-3/+1
* | | WIP - starting refactoring import/export to use servicesJames Lopez2016-06-131-0/+29
* | | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-06-133-33/+39
|\ \ \ | |/ /
| * | refactored notes logicJames Lopez2016-06-131-3/+5
| * | few more changes based on feedbackJames Lopez2016-06-133-16/+25
| * | addressing MR feedback, few changes to members mapperJames Lopez2016-06-131-15/+10
* | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-06-133-3/+3
|\ \ \ | |/ /
| * | corrected a few warningsJames Lopez2016-06-133-3/+3
* | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-06-1314-163/+189
|\ \ \ | |/ /
| * | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-06-131-1/+1
| |\ \ | | |/
| | * fixed deprecation warningJames Lopez2016-06-131-1/+1
| * | fixed specs and refactored a few things due to recent model changes and merge...James Lopez2016-06-132-8/+3
| * | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-06-135-18/+47
| |\ \ | | |/
| | * added comments to import export reader classJames Lopez2016-06-131-0/+29
| | * refactored loads of things due to commits to pipeline changeJames Lopez2016-06-132-4/+3
| | * few more modifications based on commentsJames Lopez2016-06-131-7/+8