 Douwe Maan
|
6ce25e7b4c
|
Rename MergeRequest methods that return commits or shas to be more clear and consistent
|
2016-07-06 18:50:58 -04:00 |
|
 Grzegorz Bizon
|
9e211091a8
|
Enable Style/EmptyLines cop, remove redundant ones
|
2016-07-01 21:56:17 +02:00 |
|
 James Lopez
|
f29c30475e
|
use has_many relationship with events
|
2016-07-01 15:34:10 +02:00 |
|
|
James Lopez
|
d6d0a35598
|
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-export-events
|
2016-07-01 14:52:38 +02:00 |
|
|
Grzegorz Bizon
|
9798ac77ed
|
Enable Style/SpaceAfterColon Rubocop cops
|
2016-06-29 15:16:04 +02:00 |
|
|
James Lopez
|
a65cf77ed9
|
fixes and refactored JSON spec
|
2016-06-29 13:11:26 +02:00 |
|
|
James Lopez
|
3d2a736679
|
fixing events for import/export
|
2016-06-29 10:35:26 +02:00 |
|
|
James Lopez
|
f854f6cd02
|
fixed pipeline notes issue
|
2016-06-23 12:29:11 +02:00 |
|
|
James Lopez
|
f6896f9381
|
fix annoying spec
|
2016-06-15 12:15:42 +02:00 |
|
|
James Lopez
|
cbd0201fdb
|
fixing specs and some code cleanup
|
2016-06-15 10:37:17 +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
|
fde90c3e7f
|
better coverage for Reader
|
2016-06-14 10:12:41 +02:00 |
|
|
James Lopez
|
4020b0f55f
|
few changes based on MR feedback
|
2016-06-13 21:18:26 +02:00 |
|
|
James Lopez
|
833dc3204d
|
few more changes based on feedback
|
2016-06-13 16:55:51 +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
|
069bc26418
|
refactored loads of things due to commits to pipeline change
|
2016-06-13 10:55:54 +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
|
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
|
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
|
220e55a980
|
fix spec
|
2016-05-13 20:58:27 +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
|
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
|
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
|
e6fcd6d5bd
|
fixed more import merging issues
|
2016-05-10 12:30:45 +02: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
|
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
|
ce598b0541
|
fixed and refactored a few things based on MR feedback
|
2016-05-06 13:40:02 +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
|
e172028a36
|
Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
|
2016-05-03 13:07:16 +02:00 |
|
|
James Lopez
|
1990616a21
|
fixed warning
|
2016-05-03 13:06:00 +02:00 |
|
|
James Lopez
|
97c3aff16f
|
refactored import stuff, moved to lib
|
2016-04-14 17:10:57 +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 |
|