summaryrefslogtreecommitdiff
path: root/spec/lib/gitlab/import_export
Commit message (Expand)AuthorAgeFilesLines
* fix MR source project assignmentfix/import-mr-sourceJames Lopez2016-08-092-3/+25
* Merge branch 'rubocop/enable-more-cops-for-empty-lines' into 'master' Robert Speicher2016-08-081-1/+0
|\
| * Enable some Rubocop cops related to new linesGrzegorz Bizon2016-08-031-1/+0
* | Support pending invitation project members importing projectsJames Lopez2016-08-081-0/+20
* | Fix Import/Export error checking versionsfix/import-errorJames Lopez2016-08-031-0/+30
|/
* squashed - fixed label and milestone association problems, updated specs and ...fix/labels-milestones-importJames Lopez2016-08-013-141/+77
* fix specJames Lopez2016-07-191-1/+1
* squashed - added avatar saver/restorer and specsfix/import-export-project-avatarJames Lopez2016-07-192-0/+52
* Squashed - fix encoding issuefix/import-export-encodingJames Lopez2016-07-193-11/+23
* Merge branch 'fix/project-export-filename' into 'master' Douwe Maan2016-07-151-0/+21
|\
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-exp...fix/project-export-filenameJames Lopez2016-07-151-0/+8
| |\
| * | add project name and namespace to filename on project exportJames Lopez2016-07-151-0/+21
* | | Merge branch 'fix/ee-to-ce-import'Douwe Maan2016-07-151-0/+1
|\ \ \ | |_|/ |/| |
| * | fix EE => CE project import, and updated JSON specJames Lopez2016-07-141-0/+1
| |/
* | fix updated_at not preserved after import - for GitLab projectsJames Lopez2016-07-141-0/+8
|/
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-even...James Lopez2016-07-116-8/+1
|\
| * Rename MergeRequest methods that return commits or shas to be more clear and ...Douwe Maan2016-07-061-1/+1
| * Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-linesGrzegorz Bizon2016-07-016-7/+0
* | squashed - refactor to cope with sub sub N relations probably using the sub_r...James Lopez2016-07-112-2/+29
|/
* use has_many relationship with eventsJames Lopez2016-07-011-0/+6
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-expo...James Lopez2016-07-011-1/+1
|\
| * Enable Style/SpaceAfterColon Rubocop copsGrzegorz Bizon2016-06-291-1/+1
* | fixes and refactored JSON specJames Lopez2016-06-291-2022/+4040
* | fixing events for import/exportJames Lopez2016-06-291-2/+5
|/
* fixed pipeline notes issueJames Lopez2016-06-232-0/+29
* fix annoying specJames Lopez2016-06-151-1/+1
* fixing specs and some code cleanupJames Lopez2016-06-152-2/+3
* fix mergeJames Lopez2016-06-141-5/+5
* Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-06-142-26/+87
|\
| * better coverage for ReaderJames Lopez2016-06-141-0/+61
| * few changes based on MR feedbackJames Lopez2016-06-131-1/+1
* | few more changes based on feedbackJames Lopez2016-06-131-1/+1
* | fixed specs and refactored a few things due to recent model changes and merge...James Lopez2016-06-131-303/+150
* | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-06-134-15/+39
|\ \ | |/
| * refactored loads of things due to commits to pipeline changeJames Lopez2016-06-132-12/+19
| * WIP - added missing notes, trying to fix specsJames Lopez2016-06-031-4/+21
| * started refactoring a bunch of stuff based on feedbackJames Lopez2016-06-032-4/+4
* | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-05-181-2/+7
|\ \ | |/
| * fixed CI commits on exportJames Lopez2016-05-181-2/+7
* | fix merge conflictsJames Lopez2016-05-161-3/+3
|\ \ | |/
| * some changes based on MR feedbackJames Lopez2016-05-161-3/+3
* | fix specJames Lopez2016-05-131-2/+6
* | fixed leaving comments on notes about missing authorsJames Lopez2016-05-131-1/+1
* | update json and fix notes issueJames Lopez2016-05-131-154/+5215
* | add message to notes about missing author on importJames Lopez2016-05-132-7/+6
* | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-05-121-0/+7
|\ \ | |/
| * add author on notes to export - so we can add to a note if project member is ...James Lopez2016-05-121-0/+7
* | refactored import to use shared error stuff and fixed a few issues with recen...James Lopez2016-05-111-1/+2
* | Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-05-101-2/+2
|\ \ | |/
| * added better error handling. Also refactored some of the code and fixed a few...James Lopez2016-05-101-2/+2