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
60a2b3eff2
allow empty repos on import/export
2016-07-18 11:02:07 +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
91a183bc57
fix log statements in import/export
2016-07-07 09:49:46 +02:00
09452715d3
fix typo
2016-07-06 11:09:07 +02:00
95f630daeb
even more debug
2016-07-06 10:29:31 +02: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
3d2a736679
fixing events for import/export
2016-06-29 10:35:26 +02:00
46b89a270f
Fix tmp file being deleted after the request plus some cleanup and improved erroring for this situation
2016-06-24 10:50:23 +02:00
16ed545e7c
fix utc error
2016-06-22 14:12:50 +02:00
1b8a107325
fix wiki stuff
2016-06-16 10:59:36 +02:00
4bde59341f
lots of refactoring again based on feedback. Changed the UI slightly and also fixed a small bug
2016-06-15 17:31:00 +02:00
fc5f6943f8
yay finally importing working with the new services structure
2016-06-14 21:41:40 +02:00
ff44198e17
few fixes after refactoring the whole UI stuff
2016-06-14 21:03:14 +02:00
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
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
862b359b9a
fix merge issue
2016-06-14 16:37:41 +02:00
9ecebaaea1
adding notifications stuff and more refactoring for exporting projects
2016-06-14 16:31:03 +02:00
fe370b1c39
new export stuff and view
2016-06-14 14:28:30 +02:00
3f7ed55011
lots of refactoring to reuse import service
2016-06-14 12:47:07 +02:00
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
279412f90a
updated relation_factory based on MR feedback
2016-06-14 10:55:24 +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
f6ed7c8ff8
missed line break
2016-06-14 10:15:20 +02:00
4020b0f55f
few changes based on MR feedback
2016-06-13 21:18:26 +02:00
903da37755
WIP - starting refactoring import/export to use services
2016-06-13 20:35:57 +02:00
bd5c749f29
fix file.write
2016-06-13 18:24:21 +02:00
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
9fd35740b8
refactored notes logic
2016-06-13 17:09:21 +02:00
833dc3204d
few more changes based on feedback
2016-06-13 16:55:51 +02:00
f4d762d7c2
addressing MR feedback, few changes to members mapper
2016-06-13 16:12:40 +02:00
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
e5cf4cd745
corrected a few warnings
2016-06-13 15:33:28 +02:00
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
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
86e4751011
fixed deprecation warning
2016-06-13 13:42:30 +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
cc32260394
added comments to import export reader class
2016-06-13 12:32:15 +02:00
069bc26418
refactored loads of things due to commits to pipeline change
2016-06-13 10:55:54 +02:00
James Lopez
Douwe Maan
Douwe Maan
Grzegorz Bizon