c7b31e4029
Enable some Rubocop cops related to new lines
2016-08-03 12:02:41 +02:00
aad0ae7162
squashed - fixed label and milestone association problems, updated specs and refactored reader class a bit
2016-08-01 09:57:40 +02:00
f85b78c1e9
fix spec
2016-07-19 14:31:22 +02:00
76771c2946
squashed - added avatar saver/restorer and specs
...
added spec for avatar saver
avatar saver!
added avatar restorer spec
fix spec
added avatar restorer class
fix export service
fix warnings, added changelog
fix spec
some refactoring based on feedback
fixed a few issues after testing i/e avatar
2016-07-19 13:06:06 +02:00
bf1ea8c6fe
Squashed - fix encoding issue
...
WIP - trying to replicate UTF-8 error
fix spec
fixing encoding issue and another spec, to do with MR diffs
fix issue and spec failure
Add changelog and bumped up I/E version
fix spec based on feedback - omitted target project
2016-07-19 09:59:54 +02:00
686381f7e6
Merge branch 'fix/project-export-filename' into 'master'
...
add project name and namespace to filename on project export
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19848
Export filename now includes project and namespace path
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG ) entry added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides )
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits )
See merge request !5268
2016-07-15 19:21:35 +00:00
4859770e26
Merge branch 'fix/ee-to-ce-import'
2016-07-15 14:18:31 -05:00
9b86006ca1
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-export-filename
2016-07-15 17:05:05 +02:00
65549a5866
add project name and namespace to filename on project export
...
added changelog
2016-07-15 12:55:28 +02:00
b1ab079fae
fix updated_at not preserved after import - for GitLab projects
2016-07-14 16:03:00 +02:00
097706b458
fix EE => CE project import, and updated JSON spec
2016-07-14 12:07:54 +02:00
feecb4afde
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-event-error
2016-07-11 18:00:19 +02:00
0e5f0276ea
squashed - refactor to cope with sub sub N relations probably using the sub_relations method recursively.
2016-07-11 17:21:22 +02:00
6ce25e7b4c
Rename MergeRequest methods that return commits or shas to be more clear and consistent
2016-07-06 18:50:58 -04:00
9e211091a8
Enable Style/EmptyLines cop, remove redundant ones
2016-07-01 21:56:17 +02:00
f29c30475e
use has_many relationship with events
2016-07-01 15:34:10 +02:00
d6d0a35598
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-export-events
2016-07-01 14:52:38 +02:00
9798ac77ed
Enable Style/SpaceAfterColon Rubocop cops
2016-06-29 15:16:04 +02:00
a65cf77ed9
fixes and refactored JSON spec
2016-06-29 13:11:26 +02:00
3d2a736679
fixing events for import/export
2016-06-29 10:35:26 +02:00
f854f6cd02
fixed pipeline notes issue
2016-06-23 12:29:11 +02:00
f6896f9381
fix annoying spec
2016-06-15 12:15:42 +02:00
cbd0201fdb
fixing specs and some code cleanup
2016-06-15 10:37:17 +02:00
7779457907
fix merge
2016-06-14 10:20:47 +02:00
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
fde90c3e7f
better coverage for Reader
2016-06-14 10:12:41 +02:00
4020b0f55f
few changes based on MR feedback
2016-06-13 21:18:26 +02:00
833dc3204d
few more changes based on feedback
2016-06-13 16:55:51 +02:00
b07dc938b9
fixed specs and refactored a few things due to recent model changes and merge conflicts
2016-06-13 13:34:36 +02:00
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
069bc26418
refactored loads of things due to commits to pipeline change
2016-06-13 10:55:54 +02:00
8476f91a4e
WIP - added missing notes, trying to fix specs
2016-06-03 17:28:08 +02:00
9d0038f2d7
started refactoring a bunch of stuff based on feedback
2016-06-03 12:56:29 +02:00
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
a5f04ad488
fixed CI commits on export
2016-05-18 17:48:15 +02:00
834c953750
fix merge conflicts
2016-05-16 11:22:59 +02:00
f386d7a7b7
some changes based on MR feedback
2016-05-16 10:13:00 +02:00
220e55a980
fix spec
2016-05-13 20:58:27 +02:00
1eb802cde3
fixed leaving comments on notes about missing authors
2016-05-13 16:25:27 +02:00
a868258269
update json and fix notes issue
2016-05-13 14:17:10 +02:00
25a1c6541a
add message to notes about missing author on import
2016-05-13 12:33:13 +02:00
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
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
a61456e44e
refactored import to use shared error stuff and fixed a few issues with recent refactorings
2016-05-11 17:22:45 +02:00
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
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
e6fcd6d5bd
fixed more import merging issues
2016-05-10 12:30:45 +02:00
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
3aee167dcc
fixed issues after refactor, spec passing
2016-05-09 11:10:12 +02:00
8ac53eb5d0
started refactoring import export reader - WIP
2016-05-06 17:55:06 +02:00
49cdb778a1
few fixes to import specs and code
2016-05-06 15:18:25 +02:00
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
ce598b0541
fixed and refactored a few things based on MR feedback
2016-05-06 13:40:02 +02:00
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
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
1990616a21
fixed warning
2016-05-03 13:06:00 +02:00
97c3aff16f
refactored import stuff, moved to lib
2016-04-14 17:10:57 +02:00
0852f539aa
refactored stuff, added a save and compress all class and moved mostly everything to lib
2016-04-14 16:57:25 +02:00
Grzegorz Bizon
James Lopez
Douwe Maan
Douwe Maan