 James Lopez
|
fa1884698d
|
a few nice to have and updated changelog
|
2016-05-20 10:57:10 +02:00 |
|
|
James Lopez
|
56b2f5e03f
|
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-19 17:07:55 +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
|
24d56853b0
|
fix merge conflicts
|
2016-05-19 16:11:10 +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
|
bac27df16c
|
Squashed commit of the following:
commit 92de6309e1
Merge: 6c082ed 30f4dcd
Author: James Lopez <james@jameslopez.es>
Date: Thu May 19 13:06:34 2016 +0200
Merge branches 'feature/project-export' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import
commit 30f4dcd4c9
Author: James Lopez <james@jameslopez.es>
Date: Thu May 19 13:02:57 2016 +0200
uploads export
|
2016-05-19 13:10:41 +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
|
b05b21d2c2
|
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-18 18:18:26 +02:00 |
|
|
James Lopez
|
6c082edef8
|
fixed issue exporting builds
|
2016-05-18 18:17:16 +02:00 |
|
|
James Lopez
|
be0c266c77
|
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-18 17:55:26 +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
|
797504a8d9
|
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-18 15:28:46 +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
|
0056cf0439
|
Merge branches 'feature/project-export' and 'feature/project-export-ui-experimental' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
|
2016-05-18 11:16:37 +02:00 |
|
|
James Lopez
|
bcda64c75c
|
added DB configuration
|
2016-05-18 10:39:53 +02:00 |
|
|
James Lopez
|
20f1e284fe
|
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-17 16:31:57 +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
|
e1ab530ffa
|
Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
|
2016-05-16 15:39:39 +02:00 |
|
|
James Lopez
|
279915253c
|
fix issue with forked MRs
|
2016-05-16 15:29:14 +02:00 |
|
|
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 |
|