root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
52,565 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

224 Commits

Author SHA1 Message Date
James Lopez ff44198e17 few fixes after refactoring the whole UI stuff 2016-06-14 21:03:14 +02:00
James Lopez b53ed84843 adapted current services stuff to use new project import, plus fixes a few issues, updated routes, etc... 2016-06-14 20:32:19 +02:00
James Lopez 1d4243f5dd Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 2016-06-14 16:40:13 +02:00
James Lopez 862b359b9a fix merge issue 2016-06-14 16:37:41 +02:00
James Lopez 9ecebaaea1 adding notifications stuff and more refactoring for exporting projects 2016-06-14 16:31:03 +02:00
James Lopez fe370b1c39 new export stuff and view 2016-06-14 14:28:30 +02:00
James Lopez 3f7ed55011 lots of refactoring to reuse import service 2016-06-14 12:47:07 +02:00
James Lopez 1ea44ee750 Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 2016-06-14 11:06:22 +02:00
James Lopez 279412f90a updated relation_factory based on MR feedback 2016-06-14 10:55:24 +02:00
James Lopez 7779457907 fix merge 2016-06-14 10:20:47 +02:00
James Lopez 9ff1990422 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-06-14 10:18:03 +02:00
James Lopez f6ed7c8ff8 missed line break 2016-06-14 10:15:20 +02:00
James Lopez 4020b0f55f few changes based on MR feedback 2016-06-13 21:18:26 +02:00
James Lopez 903da37755 WIP - starting refactoring import/export to use services 2016-06-13 20:35:57 +02:00
James Lopez bd5c749f29 fix file.write 2016-06-13 18:24:21 +02:00
James Lopez f449eeb6f1 Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 2016-06-13 17:56:50 +02:00
James Lopez 9fd35740b8 refactored notes logic 2016-06-13 17:09:21 +02:00
James Lopez 833dc3204d few more changes based on feedback 2016-06-13 16:55:51 +02:00
James Lopez f4d762d7c2 addressing MR feedback, few changes to members mapper 2016-06-13 16:12:40 +02:00
James Lopez c23aaf1318 Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 2016-06-13 15:40:16 +02:00
James Lopez e5cf4cd745 corrected a few warnings 2016-06-13 15:33:28 +02:00
James Lopez e83fc684a5 Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 
# Conflicts:
#	Gemfile.lock
#	app/helpers/todos_helper.rb
#	app/models/todo.rb
#	app/views/projects/edit.html.haml
#	lib/gitlab/import_export/import_service.rb
 2016-06-13 14:00:19 +02:00
James Lopez 6f0c503397 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-06-13 13:44:00 +02:00
James Lopez 86e4751011 fixed deprecation warning 2016-06-13 13:42:30 +02:00
James Lopez b07dc938b9 fixed specs and refactored a few things due to recent model changes and merge conflicts 2016-06-13 13:34:36 +02:00
James Lopez ad68bc63b5 Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 
# Conflicts:
#	app/models/project.rb
#	db/schema.rb
#	lib/gitlab/import_export/import_export_reader.rb
 2016-06-13 12:43:25 +02:00
James Lopez cc32260394 added comments to import export reader class 2016-06-13 12:32:15 +02:00
James Lopez 069bc26418 refactored loads of things due to commits to pipeline change 2016-06-13 10:55:54 +02:00
James Lopez 771f735109 few more modifications based on comments 2016-06-13 09:37:58 +02:00
James Lopez 8476f91a4e WIP - added missing notes, trying to fix specs 2016-06-03 17:28:08 +02:00
James Lopez 9d0038f2d7 started refactoring a bunch of stuff based on feedback 2016-06-03 12:56:29 +02:00
James Lopez 41c06c311b refactoring more things based on MR feedback 2016-06-02 14:44:59 +02:00
James Lopez a9fdf62b57 refactoring relation factory, changed from module to class 2016-06-02 14:07:09 +02:00
James Lopez 102074c801 more and more refactoring 2016-06-02 10:59:54 +02:00
James Lopez 7c8359b744 started refactoring some stuff based on MR feedback 2016-06-01 18:03:51 +02:00
James Lopez fa1884698d a few nice to have and updated changelog 2016-05-20 10:57:10 +02:00
James Lopez 6782cd3cf6 fix extra space 2016-05-19 17:05:35 +02:00
James Lopez dd86c91c73 fixed small issue mapping members 2016-05-19 17:02:49 +02:00
James Lopez 7df495fb77 updated uploads saver 2016-05-19 15:37:21 +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 816dfcb1c5 fix path 2016-05-19 13:21:56 +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 d607046df3 fix merge conflicts 2016-05-10 11:56:13 +02:00
James Lopez 6a12ff6345 renaming variable 2016-05-09 18:40:31 +02:00
James Lopez f3a8821217 Merge remote-tracking branch 'gitlab/feature/project-export' into feature/project-export 2016-05-09 18:34:42 +02:00
James Lopez 21be0cae62 fixing merge issues 2016-05-09 18:33:48 +02:00
James Lopez 5dad9f1fcb new line missing 2016-05-09 16:19:07 +00:00
James Lopez 47cd14b560 Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-09 18:01:06 +02:00
James Lopez 7ff2a51eb2 more refactoring to import export reader 2016-05-09 17:58:43 +02:00
James Lopez 9c639041fe bit more refactoring of import export reader, fixed rubocop warning 2016-05-09 12:15:50 +02:00
James Lopez 3aee167dcc fixed issues after refactor, spec passing 2016-05-09 11:10:12 +02:00
James Lopez 8ac53eb5d0 started refactoring import export reader - WIP 2016-05-06 17:55:06 +02:00
James Lopez 49cdb778a1 few fixes to import specs and code 2016-05-06 15:18:25 +02:00
James Lopez 4290e9c8dd Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 
# Conflicts:
#	lib/gitlab/import_export/import_export.yml
 2016-05-06 14:45:15 +02:00
James Lopez b6ab4a3113 missing private keyword 2016-05-06 14:39:57 +02:00
James Lopez ce598b0541 fixed and refactored a few things based on MR feedback 2016-05-06 13:40:02 +02:00
James Lopez 9f5dd2de4e handling errors a bit better on import failure 2016-05-05 18:12:24 +02:00
James Lopez 9c60eca87f fix wiki import 2016-05-05 15:23:59 +02:00
James Lopez f11920e21d more fixes - restoring repo 2016-05-05 14:21:27 +02:00
James Lopez 28ba2176dc fix issue restoring repo 2016-05-05 13:19:41 +02:00
James Lopez 7204018a36 fix path to bundle 2016-05-05 12:54:12 +02:00
James Lopez 92f4bde427 use git bundle in import and add wiki repo to import 2016-05-05 12:39:18 +02:00
James Lopez 43488d277e Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-05 12:02:36 +02:00
James Lopez 6612ca096a update repo and wiki repo bundler to use git bundle instead of compressing via tar 2016-05-05 12:01:18 +02:00
James Lopez a4d242b887 refactored some namespace stuff and fixed project tree restorer spec. also removing controller so that it belongs to the UI MR 2016-05-04 17:42:02 +02:00
James Lopez 84c7b5185d Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-05-04 15:14:43 +02:00
James Lopez 773c39cca3 fixed import export reader spec 2016-05-04 15:13:44 +02:00
James Lopez 9d306eb132 picking stuff from ui related to import 2016-05-03 12:41:23 +02:00
James Lopez 548c91e3c5 Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 
# Conflicts:
#	lib/gitlab/import_export/command_line_util.rb
 2016-05-03 11:34:13 +02:00
James Lopez 58b0b1a661 picking export stuff from the UI branch 2016-05-03 11:13:10 +02:00
James Lopez 10f1609535 changes to be picked by the UI branch 2016-04-25 18:00:15 +02:00
James Lopez fedfba5519 more refactoring - easier guessing path changes 2016-04-22 12:49:37 +02:00
James Lopez 8f973b8f68 more refactoring - easier guessing path changes 2016-04-22 12:45:20 +02:00
James Lopez 45032bf403 Merge branch 'feature/project-export' into feature/project-import 2016-04-22 12:18:47 +02:00
James Lopez 4256743686 refactored path stuff 2016-04-22 12:18:11 +02:00
James Lopez ae777ea061 WIP - importing file and repo 2016-04-15 18:14:28 +02:00
James Lopez 97c3aff16f refactored import stuff, moved to lib 2016-04-14 17:10:57 +02:00
James Lopez adbcccb4dd Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-04-14 16:58:52 +02:00
James Lopez 0852f539aa refactored stuff, added a save and compress all class and moved mostly everything to lib 2016-04-14 16:57:25 +02:00