Fixing problems with events for import/export
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19202
A couple of issues related to target being missing in exported Events
(as being polymorphic and not have ActiveRecord
relationships is a bit more tricky than normal models) plus as the export was in JSON, the import retrieves hashed fields as stringified hashes and not symbolized - so fixed that as well, which was the cause of https://gitlab.com/gitlab-org/gitlab-ce/issues/19202
Also fixed / refactored tests :simpl Import/Export Version has been bumped to 0.1.1 as theses changes to events won't work very well with old exports - forcing users to generate a new export in the new version.
Merge request reports
Activity
Added 1 commit:
- 5cd3d7c4 - bump version - as old exports wont be compatible
Added 1 commit:
- a65cf77e - fixes and refactored JSON spec
Added 1 commit:
- 29b78800 - updated integration test file
Added 1 commit:
- d18bc978 - fix final line missing
Added 1 commit:
- f85f5a45 - add changelog
Added 5 commits:
-
f85f5a45...d33991f8 - 4 commits from branch
master
- 01f7d1e3 - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-export-events
-
f85f5a45...d33991f8 - 4 commits from branch
Reassigned to @rymai
@rymai feel free to review this. Thanks!
11 14 - :releases 12 - :events 13 15 - project_members: 14 16 - :user 15 17 - merge_requests: 16 18 - notes: 17 :author 19 - :author 20 - :events 18 21 - :merge_request_diff 22 - :events 19 23 - pipelines: 20 24 - notes: 21 :author 25 - :author 26 - :events Reassigned to @jameslopez
Added 129 commits:
-
01f7d1e3...c578fb06 - 128 commits from branch
master
- d6d0a355 - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-export-events
-
01f7d1e3...c578fb06 - 128 commits from branch
Added 1 commit:
- f29c3047 - use has_many relationship with events
Reassigned to @rymai
@rymai updated!
30 30 - Metrics for Rouge::Plugins::Redcarpet and Rouge::Formatters::HTMLGitlab 31 31 - Allow [ci skip] to be in any case and allow [skip ci]. !4785 (simon_w) 32 32 - Add basic system information like memory and disk usage to the admin panel 33 - Fixes issues importing events in Import/Export. Import/Export version bumped to 0.1.1 @jameslopez Please fix the CHANGELOG and squash your commits a bit and we'll be good to go!
Added 141 commits:
- 9bbe0332...c578fb06 - 132 commits from branch
master
- 5cd3d7c4 - bump version - as old exports wont be compatible
- a65cf77e - fixes and refactored JSON spec
- 29b78800 - updated integration test file
- d18bc978 - fix final line missing
- f85f5a45 - add changelog
- 01f7d1e3 - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-export-events
- d6d0a355 - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-export-events
- f29c3047 - use has_many relationship with events
- e7319d0a - Many squashed commits
Toggle commit list- 9bbe0332...c578fb06 - 132 commits from branch
@rymai gonna leave as it is as squashing is a bit of a pain for some reason. I think it's because it's getting the commits from merging with master, then if I tried to rebase everything and squash those I get merge conflicts etc...
Enabled an automatic merge when the build for e7319d0a succeeds
@jameslopez Ok, no worries then! ;)
mentioned in commit c368cb60
mentioned in issue #19488 (closed)
mentioned in commit 6e886413
Mentioned in commit stanhu/gitlab-ce@c368cb60