summaryrefslogtreecommitdiff
path: root/lib/gitlab/import_export
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-304-12/+3
|\
| * Remove serialised diff and commit columnsSean McGivern2017-11-282-10/+0
| * Fix hashed storage for attachments bugsJames Lopez2017-11-231-2/+1
| * Use latest_merge_request_diff associationSean McGivern2017-11-231-0/+2
* | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-221-1/+1
|\ \ | |/
| * Clean up schema of the "merge_requests" tableYorick Peterse2017-11-201-1/+1
* | Move ModuleWithInstanceVariables to Gitlab namespaceLin Jen-Shin2017-11-221-1/+1
* | Use StrongMemoize and enable/disable cops properlyLin Jen-Shin2017-11-181-2/+1
* | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-174-5/+8
|\ \ | |/
| * Prefer polymorphism over specific type checks in Import servicedm-import-service-polymorphismDouwe Maan2017-11-151-0/+4
| * Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-081-1/+1
| |\
| | * fix specsfix/import-export-argumentsJames Lopez2017-11-071-1/+1
| | * Fix arguments error on Import/Export fetch_ref methodJames Lopez2017-11-071-1/+1
| * | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into...Shinya Maeda2017-11-072-4/+0
| |\ \
| | * | Remove Project#clusters exportAlessio Caiazza2017-11-072-4/+0
| * | | Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-072-1/+3
| |\ \ \ | | |/ / | |/| / | | |/
| | * Merge branch 'feature/custom-attributes-on-projects-and-groups' into 'master'Rémy Coutable2017-11-072-1/+3
| | |\
| | | * Support custom attributes on projectsMarkus Koller2017-11-062-1/+3
| | * | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-031-0/+1
| | |\ \ | | | |/
| * | | Add Helm import/exportAlessio Caiazza2017-11-062-2/+3
| * | | Merge remote-tracking branch 'origin/master' into 38464-k8s-appsKamil Trzcinski2017-11-031-0/+1
| |\ \ \ | | |/ / | |/| / | | |/
| * | Fix spec. Fix usage ping. Fix warnings by adding new models and attributes.Shinya Maeda2017-11-011-2/+2
* | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-063-18/+40
|\ \ \ | | |/ | |/|
| * | Merge branch '37631-add-a-merge_request_diff_id-column-to-merge_requests' int...Yorick Peterse2017-11-021-0/+1
| |\ \ | | |/ | |/|
| | * Set merge_request_diff_id on MR when creatingSean McGivern2017-11-021-1/+1
| | * Add a column linking an MR to its diffSean McGivern2017-11-021-0/+1
| * | fix missing issue assigneesJames Lopez2017-10-311-0/+1
| |/
| * Merge branch '35580-cannot-import-project-with-milestones' into 'master'Sean McGivern2017-10-112-18/+35
| |\
| | * fixing group label import35580-cannot-import-project-with-milestonesmicael.bergeron2017-10-061-17/+27
| | * fix the project import when an issue has a group milestonemicael.bergeron2017-10-051-2/+9
| | * fix the import :milestone from adding the group_idmicael.bergeron2017-10-031-1/+1
| * | Fix static anlysys. Added safe_model_attributes.Shinya Maeda2017-10-042-1/+2
| * | Add google_api to TOP_LEVEL_ROUTES. Import/Export model failure fix. Fix stat...Shinya Maeda2017-10-042-0/+2
| |/
* | Add cop to make sure we don't use ivar in a moduleLin Jen-Shin2017-09-181-0/+1
|/
* Merge remote-tracking branch 'origin/master' into zj/gitlab-ce-zj-auto-devops...Kamil Trzcinski2017-09-071-1/+0
|\
| * Merge branch 'events-migration-cleanup' into 'master'Sean McGivern2017-09-071-1/+0
| |\
| | * Finish migration to the new events setupevents-migration-cleanupYorick Peterse2017-09-061-1/+0
* | | Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-063-27/+55
|\ \ \ | |/ /
| * | refactored codeJames Lopez2017-09-061-4/+3
| * | refactor code based on feedbackfix/import-export-performanceJames Lopez2017-09-061-3/+1
| * | fix spec failuresJames Lopez2017-09-061-1/+1
| * | small refactorJames Lopez2017-09-061-5/+5
| * | fix specsJames Lopez2017-09-051-6/+4
| * | refactor code a littleJames Lopez2017-09-051-3/+12
| * | fix export performance of CI buildsJames Lopez2017-09-052-3/+2
| * | started refactoring readerJames Lopez2017-09-051-1/+3
| * | some more refactoringJames Lopez2017-09-052-18/+5
| * | some more refactoringJames Lopez2017-09-051-17/+15
| * | enable AR caching, refactor tree hash loopJames Lopez2017-09-051-12/+27
| * | remove relation after used from the hash treeJames Lopez2017-09-051-6/+3
View Lorry Controller Status