summaryrefslogtreecommitdiff
path: root/lib/gitlab/import_export
Commit message (Expand)AuthorAgeFilesLines
* Remove the User#is_admin? methodblackst0ne2017-04-091-1/+1
* Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-062-1/+3
|\
| * Add Import/Export Setting for trigger_schedule. Remove ref validation.Shinya Maeda2017-04-062-1/+3
| * Suppress Import/Export function warnings. Add comment for confirmation.Shinya Maeda2017-04-061-1/+1
* | Fix projected import failing on missing relationsJames Edwards-Jones2017-04-061-1/+5
* | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-066-7/+82
|\ \ | |/
| * Fix issues importing forked projectsJames Lopez2017-04-046-7/+82
* | Renamed ProtectedTag push_access_levels to create_access_levelsJames Edwards-Jones2017-04-042-2/+2
* | Attempt to fix import/export of push_access_levels for protected tagsJames Edwards-Jones2017-04-042-1/+4
* | Clean up non TODO rubocop errorsJames Edwards-Jones2017-04-031-1/+1
|/
* All CI offline migrationsKamil Trzciński2017-03-172-5/+7
* Fix group members method for project import/exportDmitriy Zaporozhets2017-03-091-1/+7
* Enable and autocorrect the CustomErrorClass copSean McGivern2017-03-011-1/+1
* Merge branch 'fix/import-hooks' into 'master' Rémy Coutable2017-02-162-31/+2
|\
| * Use gitlab shell import instead of manually creating the webhooksJames Lopez2017-02-162-31/+2
* | Use Namespace#full_path instead of Namespace#pathDmitriy Zaporozhets2017-02-141-1/+1
|/
* Add missing group members to export for I/Efix/import-group-membersJames Lopez2017-02-074-3/+34
* use destroy_allJames Lopez2017-01-311-3/+1
* remove old project members from projectJames Lopez2017-01-311-0/+4
* fix spec failurefix/import-encrypt-attsJames Lopez2017-01-301-1/+1
* programmatically remove encrypted attributes. Added relevant spec.James Lopez2017-01-301-0/+9
* rename method and added note to export file spec about new encrypted attributesJames Lopez2017-01-301-2/+2
* fix typoJames Lopez2017-01-301-1/+1
* Ignore encrypted attributes in Import/ExportJames Lopez2017-01-302-6/+10
* Merge branch 'fix/import-users' into 'master' Rémy Coutable2017-01-202-14/+6
|\
| * fix member mapper specfix/import-usersJames Lopez2017-01-201-2/+0
| * fix typoJames Lopez2017-01-191-1/+1
| * fix and refactor note user mappingJames Lopez2017-01-182-9/+3
| * added spec replicating the problemJames Lopez2017-01-181-1/+1
| * do not map usersat all unless adminJames Lopez2017-01-181-2/+2
* | Backport backend work for time tracking.Ruben Davila2017-01-151-0/+2
|/
* Fix error importing label priorities and added relevant specJames Lopez2016-12-211-5/+23
* Merge branch 'fix/import-export-mr-error' into 'master' Rémy Coutable2016-12-191-1/+1
|\
| * Fix MR issue to do with merge userJames Lopez2016-12-191-1/+1
* | Fix for missing service when importing from EE to CEfix/import-export-ee-servicesJames Lopez2016-12-192-1/+8
* | Fix duplicated build token problem and added relevant specfix/import-export-build-tokenJames Lopez2016-12-191-0/+2
|/
* Merge branch 'fix/import-export-symlink-vulnerability' into 'security'Douwe Maan2016-11-033-3/+24
* Merge branch 'fix/import-projectmember-security' into 'security'Douwe Maan2016-11-033-12/+29
* Update specs to cope with new label types and prioritiesJames Lopez2016-10-194-12/+27
* Use try instead of ternary operator on Gitlab::ImportExport::ProjectTreeRestorerDouglas Barbosa Alexandre2016-10-191-2/+1
* Fix import/export labels to cope with project and group labels. Added relevan...James Lopez2016-10-193-4/+25
* Fix import testJames Lopez2016-10-192-3/+6
* Add Lavel#type to methods in lib/gitlab/import_export/import_export.ymlDouglas Barbosa Alexandre2016-10-191-0/+2
* Merge remote-tracking branch 'dev/master'Rémy Coutable2016-10-063-5/+25
|\
| * Merge branch 'fix/id-claim-import-issue' into 'master' Douwe Maan2016-09-303-5/+25
| |\
| | * updated attribute cleaner to use allowed keyword and reject attributesJames Lopez2016-09-271-3/+3
| | * Prevent claiming associated model IDs via import and added relevant specsJames Lopez2016-09-273-5/+25
* | | Merge commit 'dev/security' into 'master'Rémy Coutable2016-10-067-7/+18
|\ \ \ | |/ / |/| |
| * | fix export project file permissions issueJames Lopez2016-09-307-7/+18
| |/
* | fix model order in import/export config and 1to1 relation issue. Added releva...James Lopez2016-09-272-4/+10
|/