Commit Graph
1809 Commits
Author SHA1 Message Date
James Lopez dd86c91c73 fixed small issue mapping members 2016-05-19 17:02:49 +02:00
James Lopez 1466997755 import uploads. Fixed a few things to do with members, triggers, etc... 2016-05-19 15:36:20 +02:00
James Lopez 92de6309e1 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-19 13:06:34 +02:00
James Lopez 30f4dcd4c9 uploads export 2016-05-19 13:02:57 +02:00
James Lopez 6c082edef8 fixed issue exporting builds 2016-05-18 18:17:16 +02:00
James Lopez 0de533ed08 fix rubocop warning 2016-05-18 17:54:39 +02:00
James Lopez 08f237516b Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-18 17:53:03 +02:00
James Lopez a5f04ad488 fixed CI commits on export 2016-05-18 17:48:15 +02:00
James Lopez 2b0d198dac Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-18 15:26:44 +02:00
James Lopez 301d64b849 updated import export conf 2016-05-18 15:23:32 +02:00
James Lopez 6956fb6366 update relation factory with new models exceptions 2016-05-18 15:22:26 +02:00
James Lopez 0df21ac712 revert changes as builds are related to statuses which are already there 2016-05-18 15:15:14 +02:00
James Lopez 4d894a7a95 added commits mapper and DB config import stuff 2016-05-18 14:32:30 +02:00
James Lopez 13ab207263 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-18 11:22:51 +02:00
James Lopez bcda64c75c added DB configuration 2016-05-18 10:39:53 +02:00
James Lopez 5bd3e8a8ba Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-17 16:30:50 +02:00
James Lopez 7733f56d80 fix specs 2016-05-17 16:28:27 +02:00
James Lopez 279915253c fix issue with forked MRs 2016-05-16 15:29:14 +02:00
James Lopez bd5b019a7c Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-16 13:29:25 +02:00
James Lopez 504c186f71 fix version issue 2016-05-16 13:28:11 +02:00
James Lopez 360689bb58 fix version 2016-05-16 13:11:49 +02:00
James Lopez c374700390 missing new line 2016-05-16 12:40:01 +02:00
James Lopez 51487575bc added version check on import 2016-05-16 12:39:42 +02:00
James Lopez 8c478874f9 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-16 12:09:18 +02:00
James Lopez 5777ad9a1f adding versioning to export 2016-05-16 12:04:31 +02:00
James Lopez 834c953750 fix merge conflicts 2016-05-16 11:22:59 +02:00
James Lopez f386d7a7b7 some changes based on MR feedback 2016-05-16 10:13:00 +02:00
James Lopez bf81c588fd fix issue with mapping members 2016-05-13 19:51:07 +02:00
James Lopez 41f9d9d9ca Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-13 17:40:33 +02:00
James Lopez 2dff04f24a fixed TODOs left 2016-05-13 17:39:03 +02:00
James Lopez 2e1decd061 restricted actual member mapping to admins 2016-05-13 17:17:46 +02:00
James Lopez 1eb802cde3 fixed leaving comments on notes about missing authors 2016-05-13 16:25:27 +02:00
James Lopez a868258269 update json and fix notes issue 2016-05-13 14:17:10 +02:00
James Lopez 25a1c6541a add message to notes about missing author on import 2016-05-13 12:33:13 +02:00
James Lopez 78cd39e480 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-12 14:34:07 +02:00
James Lopez 8165e52045 add author on notes to export - so we can add to a note if project member is not found 2016-05-12 14:27:41 +02:00
James Lopez 3b7e5df890 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-12 11:30:05 +02:00
James Lopez b2b7b38c94 fix rubocop warnings 2016-05-12 11:29:06 +02:00
James Lopez ff56f7be62 fix importer issue 2016-05-12 11:03:55 +02:00
James Lopez f06c5516db fix issue in import_service 2016-05-12 10:57:28 +02:00
James Lopez 385d6df20c typo 2016-05-12 10:39:59 +02:00
James Lopez a61456e44e refactored import to use shared error stuff and fixed a few issues with recent refactorings 2016-05-11 17:22:45 +02:00
James Lopez 27867f3542 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-11 14:52:56 +02:00
James Lopez cffae0d22e fixing more export problems 2016-05-11 14:51:25 +02:00
James Lopez a86da1b73b Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-11 13:21:34 +02:00
James Lopez 49e6fc40b9 fix bad refactor 2016-05-11 13:17:49 +02:00
James Lopez 6fa529e981 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-10 17:18:04 +02:00
James Lopez a5d59f075a added better error handling. Also refactored some of the code and fixed a few issues in project_tree_saver 2016-05-10 17:15:20 +02:00
James Lopez 5b51d13c5e removed method no longer needed 2016-05-10 12:01:10 +02:00
James Lopez d607046df3 fix merge conflicts 2016-05-10 11:56:13 +02:00