 James Lopez
|
155d02c8d7
|
Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
|
2016-05-16 13:30:40 +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
|
6930f9a9cd
|
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-05-16 12:52:32 +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
|
3c3559cf67
|
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-05-16 11:25:38 +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
|
13d64e7ee9
|
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-05-13 19:52:36 +02:00 |
|
|
James Lopez
|
bf81c588fd
|
fix issue with mapping members
|
2016-05-13 19:51:07 +02:00 |
|
|
James Lopez
|
2cc5b1f166
|
Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
|
2016-05-13 17:42:13 +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
|
0bacae0f82
|
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-05-13 17:20:17 +02:00 |
|
|
James Lopez
|
2e1decd061
|
restricted actual member mapping to admins
|
2016-05-13 17:17:46 +02:00 |
|
|
James Lopez
|
5355589cec
|
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-05-13 16:26:49 +02:00 |
|
|
James Lopez
|
1eb802cde3
|
fixed leaving comments on notes about missing authors
|
2016-05-13 16:25:27 +02:00 |
|
|
James Lopez
|
2791335384
|
Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
|
2016-05-13 14:20:13 +02:00 |
|
|
James Lopez
|
a868258269
|
update json and fix notes issue
|
2016-05-13 14:17:10 +02:00 |
|
|
James Lopez
|
ffa71b6a7c
|
Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
|
2016-05-13 12:34:43 +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
|
f6c9883dc0
|
Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
|
2016-05-12 11:04:55 +02:00 |
|
|
James Lopez
|
ff56f7be62
|
fix importer issue
|
2016-05-12 11:03:55 +02:00 |
|
|
James Lopez
|
350022ff62
|
Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
|
2016-05-12 10:59:16 +02:00 |
|
|
James Lopez
|
f06c5516db
|
fix issue in import_service
|
2016-05-12 10:57:28 +02:00 |
|
|
James Lopez
|
2a70d963a0
|
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-05-12 10:46:20 +02:00 |
|
|
James Lopez
|
385d6df20c
|
typo
|
2016-05-12 10:39:59 +02:00 |
|
|
James Lopez
|
7a80880f38
|
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-05-11 17:25:49 +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
|
0d83b908b7
|
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-05-11 14:55:30 +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
|
d4ab068e8a
|
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-05-11 13:23:27 +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
|
df6483c65f
|
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-05-10 17:22:28 +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
|
278be18cf0
|
Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
|
2016-05-10 12:37:33 +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 |
|
|
James Lopez
|
6a12ff6345
|
renaming variable
|
2016-05-09 18:40:31 +02:00 |
|