Commit 4756edbe authored by Bob Van Landuyt's avatar Bob Van Landuyt

Merge branch 'georgekoltsov/import-epic-system-notes' into 'master'

Add epic's note system_note_meta to Import/Export

See merge request gitlab-org/gitlab!63551
parents 7574ed6c ca32a0f9
{"id":13622,"milestone_id":null,"group_id":4351,"author_id":1,"assignee_id":null,"iid":1,"updated_by_id":null,"last_edited_by_id":null,"lock_version":0,"start_date":null,"end_date":null,"last_edited_at":null,"created_at":"2019-11-20T17:02:09.754Z","updated_at":"2019-11-20T18:38:40.054Z","title":"Provident neque consequatur numquam ad laboriosam voluptatem magnam.","description":"Fugit nisi est ut numquam quia rerum vitae qui. Et in est aliquid voluptas et ut vitae. In distinctio voluptates ut deleniti iste.\n\nReiciendis eum sunt vero blanditiis at quia. Voluptate eum facilis illum ea distinctio maiores. Doloribus aut nemo ea distinctio.\n\nNihil cum distinctio voluptates quam. Laboriosam distinctio ea accusantium soluta perspiciatis nesciunt impedit. Id qui natus quis minima voluptatum velit ut reprehenderit. Molestiae quia est harum sapiente rem error architecto id. Et minus ipsa et ut ut.","start_date_sourcing_milestone_id":null,"due_date_sourcing_milestone_id":null,"start_date_fixed":null,"due_date_fixed":null,"start_date_is_fixed":null,"due_date_is_fixed":null,"closed_by_id":null,"closed_at":null,"parent_id":null,"relative_position":null,"state_id":"opened","start_date_sourcing_epic_id":null,"due_date_sourcing_epic_id":null,"notes":[{"id":44170,"note":"added epic &5 as child epic","noteable_type":"Epic","author_id":1,"created_at":"2019-11-20T18:38:40.031Z","updated_at":"2019-11-20T18:38:40.035Z","project_id":null,"attachment":{"url":null},"line_code":null,"commit_id":null,"noteable_id":13622,"system":true,"st_diff":null,"updated_by_id":null,"position":null,"original_position":null,"resolved_at":null,"resolved_by_id":null,"discussion_id":"ba005d8dd59cd37a4f32406d46e759b08fd15510","change_position":null,"resolved_by_push":null,"review_id":null,"type":null,"author":{"name":"Administrator"},"award_emoji":[{"id":12,"name":"drum","user_id":1,"awardable_type":"Note","awardable_id":44170,"created_at":"2019-11-05T15:32:21.287Z","updated_at":"2019-11-05T15:32:21.287Z"}]},{"id":44168,"note":"added epic &4 as child epic","noteable_type":"Epic","author_id":1,"created_at":"2019-11-20T18:38:35.669Z","updated_at":"2019-11-20T18:38:35.673Z","project_id":null,"attachment":{"url":null},"line_code":null,"commit_id":null,"noteable_id":13622,"system":true,"st_diff":null,"updated_by_id":null,"position":null,"original_position":null,"resolved_at":null,"resolved_by_id":null,"discussion_id":"9b49d3b017aadc1876d477b960e6f8efb99ce29f","change_position":null,"resolved_by_push":null,"review_id":null,"type":null,"author":{"name":"Administrator"}},{"id":44166,"note":"added epic &3 as child epic","noteable_type":"Epic","author_id":1,"created_at":"2019-11-20T18:38:30.944Z","updated_at":"2019-11-20T18:38:30.948Z","project_id":null,"attachment":{"url":null},"line_code":null,"commit_id":null,"noteable_id":13622,"system":true,"st_diff":null,"updated_by_id":null,"position":null,"original_position":null,"resolved_at":null,"resolved_by_id":null,"discussion_id":"cccfe967f48e699a466c87a55a9f8acb00fec1a1","change_position":null,"resolved_by_push":null,"review_id":null,"type":null,"author":{"name":"Administrator"}},{"id":44164,"note":"added epic &2 as child epic","noteable_type":"Epic","author_id":1,"created_at":"2019-11-20T18:38:26.689Z","updated_at":"2019-11-20T18:38:26.724Z","project_id":null,"attachment":{"url":null},"line_code":null,"commit_id":null,"noteable_id":13622,"system":true,"st_diff":null,"updated_by_id":null,"position":null,"original_position":null,"resolved_at":null,"resolved_by_id":null,"discussion_id":"133f0c3001860fa8d2031e398a65db74477378c4","change_position":null,"resolved_by_push":null,"review_id":null,"type":null,"author":{"name":"Administrator"}}],"award_emoji":[{"id":12,"name":"thumbsup","user_id":1,"awardable_type":"Epic","awardable_id":13622,"created_at":"2019-11-05T15:37:21.287Z","updated_at":"2019-11-05T15:37:21.287Z"}], "label_links": [{"id": 1, "label_id": 2, "target_id": 3, "target_type": "Epic", "created_at": "2021-04-14 14:42:21.717503", "updated_at": "2021-04-14 14:42:21.717503", "label": {"title": "title", "description": "description", "color": "#cd2c5c", "created_at": "2021-04-14 14:42:21.717503", "updated_at": "2021-04-14 14:42:21.717503", "type": "GroupLabel" }}]}
{"id":13623,"milestone_id":null,"group_id":4351,"author_id":1,"assignee_id":null,"iid":2,"updated_by_id":null,"last_edited_by_id":null,"lock_version":0,"start_date":null,"end_date":null,"last_edited_at":null,"created_at":"2019-11-20T17:02:09.769Z","updated_at":"2019-11-20T18:38:26.851Z","title":"Omnis accusantium commodi voluptas odio illo eum ut.","description":"Eius vero et iste amet est voluptatem modi. Doloribus ipsam beatae et ut autem ut animi. Dolor culpa dolor omnis delectus est tempora inventore ab. Optio labore tenetur libero quia provident et quis. Blanditiis architecto sint possimus cum aut adipisci.\n\nDolores quisquam sunt cupiditate unde qui vitae nemo. Odio quas omnis ut nobis. Possimus fugit deserunt quia sed ab numquam veritatis nihil.\n\nQui nemo adipisci magnam perferendis voluptatem modi. Eius enim iure dolores consequuntur eum nobis adipisci. Consequatur architecto et quas deleniti hic id laborum officiis. Enim perferendis quis quasi totam delectus rerum deleniti.","start_date_sourcing_milestone_id":null,"due_date_sourcing_milestone_id":null,"start_date_fixed":null,"due_date_fixed":null,"start_date_is_fixed":null,"due_date_is_fixed":null,"closed_by_id":null,"closed_at":null,"parent_id":13622,"relative_position":1073741323,"state_id":"opened","start_date_sourcing_epic_id":null,"due_date_sourcing_epic_id":null,"parent":{"id":13622,"milestone_id":null,"group_id":4351,"author_id":1,"assignee_id":null,"iid":1,"updated_by_id":null,"last_edited_by_id":null,"lock_version":0,"start_date":null,"end_date":null,"last_edited_at":null,"created_at":"2019-11-20T17:02:09.754Z","updated_at":"2019-11-20T18:38:40.054Z","title":"Provident neque consequatur numquam ad laboriosam voluptatem magnam.","description":"Fugit nisi est ut numquam quia rerum vitae qui. Et in est aliquid voluptas et ut vitae. In distinctio voluptates ut deleniti iste.\n\nReiciendis eum sunt vero blanditiis at quia. Voluptate eum facilis illum ea distinctio maiores. Doloribus aut nemo ea distinctio.\n\nNihil cum distinctio voluptates quam. Laboriosam distinctio ea accusantium soluta perspiciatis nesciunt impedit. Id qui natus quis minima voluptatum velit ut reprehenderit. Molestiae quia est harum sapiente rem error architecto id. Et minus ipsa et ut ut.","start_date_sourcing_milestone_id":null,"due_date_sourcing_milestone_id":null,"start_date_fixed":null,"due_date_fixed":null,"start_date_is_fixed":null,"due_date_is_fixed":null,"closed_by_id":null,"closed_at":null,"parent_id":null,"relative_position":null,"state_id":"opened","start_date_sourcing_epic_id":null,"due_date_sourcing_epic_id":null},"notes":[{"id":44165,"note":"added epic &1 as parent epic","noteable_type":"Epic","author_id":1,"created_at":"2019-11-20T18:38:26.822Z","updated_at":"2019-11-20T18:38:26.826Z","project_id":null,"attachment":{"url":null},"line_code":null,"commit_id":null,"noteable_id":13623,"system":true,"st_diff":null,"updated_by_id":null,"position":null,"original_position":null,"resolved_at":null,"resolved_by_id":null,"discussion_id":"15f0a7f4ed16a07bc78841e122524bb867edcf86","change_position":null,"resolved_by_push":null,"review_id":null,"type":null,"author":{"name":"Administrator"}}], "label_links": [{"id": 1, "label_id": 2, "target_id": 3, "target_type": "Epic", "created_at": "2021-04-14 14:42:21.717503", "updated_at": "2021-04-14 14:42:21.717503", "label": {"title": "title", "description": "description", "color": "#cd2c5c", "created_at": "2021-04-14 14:42:21.717503", "updated_at": "2021-04-14 14:42:21.717503", "type": "GroupLabel" }}]}
{"id":13624,"milestone_id":null,"group_id":4351,"author_id":1,"assignee_id":null,"iid":3,"updated_by_id":null,"last_edited_by_id":null,"lock_version":0,"start_date":null,"end_date":null,"last_edited_at":null,"created_at":"2019-11-20T17:02:09.783Z","updated_at":"2019-11-20T18:38:31.018Z","title":"Quis dolore velit possimus eaque aut amet esse voluptate aliquam.","description":"Ab veritatis reprehenderit nulla laboriosam et sed asperiores corporis. Est accusantium maxime perferendis et. Omnis a qui voluptates non excepturi.\n\nAdipisci labore maiores dicta sed magnam aut. Veritatis delectus dolorum qui id. Dolorum tenetur quo iure amet. Eveniet reprehenderit dolor ipsam quia ratione quo. Facilis voluptatem vel repellat id illum.\n\nAut et magnam aut minus aspernatur. Fuga quo necessitatibus mollitia maxime quasi. Qui aspernatur quia accusamus est quod. Qui assumenda veritatis dolor non eveniet quibusdam quos qui.","start_date_sourcing_milestone_id":null,"due_date_sourcing_milestone_id":null,"start_date_fixed":null,"due_date_fixed":null,"start_date_is_fixed":null,"due_date_is_fixed":null,"closed_by_id":null,"closed_at":null,"parent_id":13622,"relative_position":1073740823,"state_id":"opened","start_date_sourcing_epic_id":null,"due_date_sourcing_epic_id":null,"parent":{"id":13622,"milestone_id":null,"group_id":4351,"author_id":1,"assignee_id":null,"iid":1,"updated_by_id":null,"last_edited_by_id":null,"lock_version":0,"start_date":null,"end_date":null,"last_edited_at":null,"created_at":"2019-11-20T17:02:09.754Z","updated_at":"2019-11-20T18:38:40.054Z","title":"Provident neque consequatur numquam ad laboriosam voluptatem magnam.","description":"Fugit nisi est ut numquam quia rerum vitae qui. Et in est aliquid voluptas et ut vitae. In distinctio voluptates ut deleniti iste.\n\nReiciendis eum sunt vero blanditiis at quia. Voluptate eum facilis illum ea distinctio maiores. Doloribus aut nemo ea distinctio.\n\nNihil cum distinctio voluptates quam. Laboriosam distinctio ea accusantium soluta perspiciatis nesciunt impedit. Id qui natus quis minima voluptatum velit ut reprehenderit. Molestiae quia est harum sapiente rem error architecto id. Et minus ipsa et ut ut.","start_date_sourcing_milestone_id":null,"due_date_sourcing_milestone_id":null,"start_date_fixed":null,"due_date_fixed":null,"start_date_is_fixed":null,"due_date_is_fixed":null,"closed_by_id":null,"closed_at":null,"parent_id":null,"relative_position":null,"state_id":"opened","start_date_sourcing_epic_id":null,"due_date_sourcing_epic_id":null},"notes":[{"id":44167,"note":"added epic &1 as parent epic","noteable_type":"Epic","author_id":1,"created_at":"2019-11-20T18:38:30.989Z","updated_at":"2019-11-20T18:38:30.993Z","project_id":null,"attachment":{"url":null},"line_code":null,"commit_id":null,"noteable_id":13624,"system":true,"st_diff":null,"updated_by_id":null,"position":null,"original_position":null,"resolved_at":null,"resolved_by_id":null,"discussion_id":"423ffec14a3ce148c11a802eb1f2613fa8ca9a94","change_position":null,"resolved_by_push":null,"review_id":null,"type":null,"author":{"name":"Administrator"}}], "label_links": [{"id": 1, "label_id": 2, "target_id": 3, "target_type": "Epic", "created_at": "2021-04-14 14:42:21.717503", "updated_at": "2021-04-14 14:42:21.717503", "label": {"title": "title", "description": "description", "color": "#cd2c5c", "created_at": "2021-04-14 14:42:21.717503", "updated_at": "2021-04-14 14:42:21.717503", "type": "GroupLabel" }}]}
{"id":13625,"milestone_id":null,"group_id":4351,"author_id":1,"assignee_id":null,"iid":4,"updated_by_id":null,"last_edited_by_id":null,"lock_version":0,"start_date":null,"end_date":null,"last_edited_at":null,"created_at":"2019-11-20T17:02:09.798Z","updated_at":"2019-11-20T18:38:35.765Z","title":"Possimus et ut iste temporibus earum cupiditate voluptatem esse assumenda amet.","description":"Et at corporis sed id rerum ullam dolore. Odio magnam corporis excepturi neque est. Est accusamus nostrum qui rerum.\n\nEt aut dolores eaque quibusdam aut quas explicabo id. Est necessitatibus praesentium omnis et vero laboriosam et. Sunt in saepe qui laudantium et voluptas.\n\nVelit sunt odit eum omnis beatae eius aut. Dolores commodi qui impedit deleniti et magnam pariatur. Aut odit amet ipsum ea atque. Itaque est ut sunt ullam eum nam.","start_date_sourcing_milestone_id":null,"due_date_sourcing_milestone_id":null,"start_date_fixed":null,"due_date_fixed":null,"start_date_is_fixed":null,"due_date_is_fixed":null,"closed_by_id":null,"closed_at":null,"parent_id":13622,"relative_position":1073740323,"state_id":"opened","start_date_sourcing_epic_id":null,"due_date_sourcing_epic_id":null,"parent":{"id":13622,"milestone_id":null,"group_id":4351,"author_id":1,"assignee_id":null,"iid":1,"updated_by_id":null,"last_edited_by_id":null,"lock_version":0,"start_date":null,"end_date":null,"last_edited_at":null,"created_at":"2019-11-20T17:02:09.754Z","updated_at":"2019-11-20T18:38:40.054Z","title":"Provident neque consequatur numquam ad laboriosam voluptatem magnam.","description":"Fugit nisi est ut numquam quia rerum vitae qui. Et in est aliquid voluptas et ut vitae. In distinctio voluptates ut deleniti iste.\n\nReiciendis eum sunt vero blanditiis at quia. Voluptate eum facilis illum ea distinctio maiores. Doloribus aut nemo ea distinctio.\n\nNihil cum distinctio voluptates quam. Laboriosam distinctio ea accusantium soluta perspiciatis nesciunt impedit. Id qui natus quis minima voluptatum velit ut reprehenderit. Molestiae quia est harum sapiente rem error architecto id. Et minus ipsa et ut ut.","start_date_sourcing_milestone_id":null,"due_date_sourcing_milestone_id":null,"start_date_fixed":null,"due_date_fixed":null,"start_date_is_fixed":null,"due_date_is_fixed":null,"closed_by_id":null,"closed_at":null,"parent_id":null,"relative_position":null,"state_id":"opened","start_date_sourcing_epic_id":null,"due_date_sourcing_epic_id":null},"notes":[{"id":44169,"note":"added epic &1 as parent epic","noteable_type":"Epic","author_id":1,"created_at":"2019-11-20T18:38:35.737Z","updated_at":"2019-11-20T18:38:35.741Z","project_id":null,"attachment":{"url":null},"line_code":null,"commit_id":null,"noteable_id":13625,"system":true,"st_diff":null,"updated_by_id":null,"position":null,"original_position":null,"resolved_at":null,"resolved_by_id":null,"discussion_id":"5bc3e30d508affafc61de2b4e1d9f21039505cc3","change_position":null,"resolved_by_push":null,"review_id":null,"type":null,"author":{"name":"Administrator"}}], "label_links": [{"id": 1, "label_id": 2, "target_id": 3, "target_type": "Epic", "created_at": "2021-04-14 14:42:21.717503", "updated_at": "2021-04-14 14:42:21.717503", "label": {"title": "title", "description": "description", "color": "#cd2c5c", "created_at": "2021-04-14 14:42:21.717503", "updated_at": "2021-04-14 14:42:21.717503", "type": "GroupLabel" }}]}
{"id":13626,"milestone_id":null,"group_id":4351,"author_id":1,"assignee_id":null,"iid":5,"updated_by_id":null,"last_edited_by_id":null,"lock_version":0,"start_date":null,"end_date":null,"last_edited_at":null,"created_at":"2019-11-20T17:02:09.812Z","updated_at":"2019-11-20T18:38:40.101Z","title":"Ab deleniti ipsum voluptatem dolor qui quos saepe repellat quo.","description":"Sunt minus sunt reiciendis culpa sed excepturi. Aperiam sed quod nemo nesciunt et quia molestias incidunt. Ipsum nam magnam labore eos a molestiae rerum possimus. Sequi autem asperiores voluptas assumenda.\n\nRerum ipsa quia cum ab corrupti omnis. Velit libero et nihil ipsa aut quo rem ipsam. Architecto omnis distinctio sed doloribus perspiciatis consequatur aut et. Fugit consequuntur est minima reiciendis reprehenderit et.\n\nConsequatur distinctio et ut blanditiis perferendis officiis inventore. Alias aut voluptatem in facere. Ut perferendis dolorum hic dolores. Ipsa dolorem soluta at mollitia. Placeat et ea numquam dicta molestias.","start_date_sourcing_milestone_id":null,"due_date_sourcing_milestone_id":null,"start_date_fixed":null,"due_date_fixed":null,"start_date_is_fixed":null,"due_date_is_fixed":null,"closed_by_id":null,"closed_at":null,"parent_id":13622,"relative_position":1073739823,"state_id":"opened","start_date_sourcing_epic_id":null,"due_date_sourcing_epic_id":null,"parent":{"id":13622,"milestone_id":null,"group_id":4351,"author_id":1,"assignee_id":null,"iid":1,"updated_by_id":null,"last_edited_by_id":null,"lock_version":0,"start_date":null,"end_date":null,"last_edited_at":null,"created_at":"2019-11-20T17:02:09.754Z","updated_at":"2019-11-20T18:38:40.054Z","title":"Provident neque consequatur numquam ad laboriosam voluptatem magnam.","description":"Fugit nisi est ut numquam quia rerum vitae qui. Et in est aliquid voluptas et ut vitae. In distinctio voluptates ut deleniti iste.\n\nReiciendis eum sunt vero blanditiis at quia. Voluptate eum facilis illum ea distinctio maiores. Doloribus aut nemo ea distinctio.\n\nNihil cum distinctio voluptates quam. Laboriosam distinctio ea accusantium soluta perspiciatis nesciunt impedit. Id qui natus quis minima voluptatum velit ut reprehenderit. Molestiae quia est harum sapiente rem error architecto id. Et minus ipsa et ut ut.","start_date_sourcing_milestone_id":null,"due_date_sourcing_milestone_id":null,"start_date_fixed":null,"due_date_fixed":null,"start_date_is_fixed":null,"due_date_is_fixed":null,"closed_by_id":null,"closed_at":null,"parent_id":null,"relative_position":null,"state_id":"opened","start_date_sourcing_epic_id":null,"due_date_sourcing_epic_id":null},"notes":[{"id":44171,"note":"added epic &1 as parent epic","noteable_type":"Epic","author_id":1,"created_at":"2019-11-20T18:38:40.074Z","updated_at":"2019-11-20T18:38:40.077Z","project_id":null,"attachment":{"url":null},"line_code":null,"commit_id":null,"noteable_id":13626,"system":true,"st_diff":null,"updated_by_id":null,"position":null,"original_position":null,"resolved_at":null,"resolved_by_id":null,"discussion_id":"a6231acdaef5f4d2e569dfb604f1baf85c49e1a0","change_position":null,"resolved_by_push":null,"review_id":null,"type":null,"author":{"name":"Administrator"}}], "label_links": [{"id": 1, "label_id": 2, "target_id": 3, "target_type": "Epic", "created_at": "2021-04-14 14:42:21.717503", "updated_at": "2021-04-14 14:42:21.717503", "label": {"title": "title", "description": "description", "color": "#cd2c5c", "created_at": "2021-04-14 14:42:21.717503", "updated_at": "2021-04-14 14:42:21.717503", "type": "GroupLabel"}}]}
{"id":17527,"group_id":1277,"author_id":1,"assignee_id":null,"iid":6,"updated_by_id":null,"last_edited_by_id":null,"lock_version":0,"start_date":null,"end_date":null,"last_edited_at":null,"created_at":"2021-06-08T14:49:25.041Z","updated_at":"2021-06-08T14:49:43.877Z","title":"system notes","description":"system notes","start_date_sourcing_milestone_id":null,"due_date_sourcing_milestone_id":null,"start_date_fixed":null,"due_date_fixed":null,"start_date_is_fixed":false,"due_date_is_fixed":false,"closed_by_id":null,"closed_at":null,"parent_id":null,"relative_position":null,"state_id":"opened","start_date_sourcing_epic_id":null,"due_date_sourcing_epic_id":null,"confidential":false,"external_key":null,"notes":[{"id":529568,"note":"added epic u00261 as child epic","noteable_type":"Epic","author_id":1,"created_at":"2021-06-08T14:49:43.774Z","updated_at":"2021-06-08T14:49:43.811Z","project_id":null,"attachment":{"url":null},"line_code":null,"commit_id":null,"noteable_id":17527,"system":true,"st_diff":null,"updated_by_id":null,"position":null,"original_position":null,"resolved_at":null,"resolved_by_id":null,"discussion_id":"63c7b8f0862ebde74eb806a2fd0d84bd53734730","change_position":null,"resolved_by_push":null,"review_id":null,"confidential":null,"last_edited_at":"2021-06-08T14:49:43.811Z","system_note_metadata":{"id":196422,"note_id":529568,"commit_count":null,"action":"relate_epic","created_at":"2021-06-08T14:49:43.843Z","updated_at":"2021-06-08T14:49:43.843Z","description_version_id":null},"author":{"id":1,"email":"admin@example.com","created_at":"2021-04-14T14:42:15.926Z","updated_at":"2021-06-08T16:32:26.109Z","name":"Administrator"},"award_emoji":[]}]}
...@@ -362,6 +362,85 @@ ...@@ -362,6 +362,85 @@
} }
} }
] ]
},
{
"id": 17527,
"group_id": 1277,
"author_id": 1,
"assignee_id": null,
"iid": 3,
"updated_by_id": null,
"last_edited_by_id": null,
"lock_version": 0,
"start_date": null,
"end_date": null,
"last_edited_at": null,
"created_at": "2021-06-08T14:49:25.041Z",
"updated_at": "2021-06-08T14:49:43.877Z",
"title": "system notes",
"description": "system notes",
"start_date_sourcing_milestone_id": null,
"due_date_sourcing_milestone_id": null,
"start_date_fixed": null,
"due_date_fixed": null,
"start_date_is_fixed": false,
"due_date_is_fixed": false,
"closed_by_id": null,
"closed_at": null,
"parent_id": null,
"relative_position": null,
"state_id": "opened",
"start_date_sourcing_epic_id": null,
"due_date_sourcing_epic_id": null,
"confidential": false,
"external_key": null,
"notes": [
{
"id": 529568,
"note": "added epic u00261 as child epic",
"noteable_type": "Epic",
"author_id": 1,
"created_at": "2021-06-08T14:49:43.774Z",
"updated_at": "2021-06-08T14:49:43.811Z",
"project_id": null,
"attachment": {
"url": null
},
"line_code": null,
"commit_id": null,
"noteable_id": 17527,
"system": true,
"st_diff": null,
"updated_by_id": null,
"position": null,
"original_position": null,
"resolved_at": null,
"resolved_by_id": null,
"discussion_id": "63c7b8f0862ebde74eb806a2fd0d84bd53734730",
"change_position": null,
"resolved_by_push": null,
"review_id": null,
"confidential": null,
"last_edited_at": "2021-06-08T14:49:43.811Z",
"system_note_metadata": {
"id": 196422,
"note_id": 529568,
"commit_count": null,
"action": "relate_epic",
"created_at": "2021-06-08T14:49:43.843Z",
"updated_at": "2021-06-08T14:49:43.843Z",
"description_version_id": null
},
"author": {
"id": 1,
"email": "",
"created_at": "2021-04-14T14:42:15.926Z",
"updated_at": "2021-06-08T16:32:26.109Z",
"name": "Administrator"
},
"award_emoji": []
}
]
} }
] ]
} }
{"id":13622,"milestone_id":null,"group_id":4351,"author_id":1,"assignee_id":null,"iid":1,"updated_by_id":null,"last_edited_by_id":null,"lock_version":0,"start_date":null,"end_date":null,"last_edited_at":null,"created_at":"2019-11-20T17:02:09.754Z","updated_at":"2019-11-20T18:38:40.054Z","title":"Provident neque consequatur numquam ad laboriosam voluptatem magnam.","description":"Fugit nisi est ut numquam quia rerum vitae qui. Et in est aliquid voluptas et ut vitae. In distinctio voluptates ut deleniti iste.\n\nReiciendis eum sunt vero blanditiis at quia. Voluptate eum facilis illum ea distinctio maiores. Doloribus aut nemo ea distinctio.\n\nNihil cum distinctio voluptates quam. Laboriosam distinctio ea accusantium soluta perspiciatis nesciunt impedit. Id qui natus quis minima voluptatum velit ut reprehenderit. Molestiae quia est harum sapiente rem error architecto id. Et minus ipsa et ut ut.","start_date_sourcing_milestone_id":null,"due_date_sourcing_milestone_id":null,"start_date_fixed":null,"due_date_fixed":null,"start_date_is_fixed":null,"due_date_is_fixed":null,"closed_by_id":null,"closed_at":null,"parent_id":null,"relative_position":null,"state":"opened","start_date_sourcing_epic_id":null,"due_date_sourcing_epic_id":null,"notes":[{"id":44164,"note":"added epic &2 as child epic","noteable_type":"Epic","author_id":1,"created_at":"2019-11-20T18:38:26.689Z","updated_at":"2019-11-20T18:38:26.724Z","project_id":null,"attachment":{"url":null},"line_code":null,"commit_id":null,"noteable_id":13622,"system":true,"st_diff":null,"updated_by_id":null,"position":null,"original_position":null,"resolved_at":null,"resolved_by_id":null,"discussion_id":"133f0c3001860fa8d2031e398a65db74477378c4","change_position":null,"resolved_by_push":null,"review_id":null,"type":null,"author":{"name":"Administrator"},"award_emoji":[{"id":12,"name":"drum","user_id":1,"awardable_type":"Note","awardable_id":44170,"created_at":"2019-11-05T15:32:21.287Z","updated_at":"2019-11-05T15:32:21.287Z"}]}],"award_emoji":[{"id":12,"name":"thumbsup","user_id":1,"awardable_type":"Epic","awardable_id":13622,"created_at":"2019-11-05T15:37:21.287Z","updated_at":"2019-11-05T15:37:21.287Z"}],"label_links":[{"id":1,"label_id":2,"target_id":3,"target_type":"Epic","created_at":"2021-04-14 14:42:21.717503","updated_at":"2021-04-14 14:42:21.717503","label":{"title":"title","description":"description","color":"#cd2c5c","created_at":"2021-04-14 14:42:21.717503","updated_at":"2021-04-14 14:42:21.717503","type":"GroupLabel"}}]} {"id":13622,"milestone_id":null,"group_id":4351,"author_id":1,"assignee_id":null,"iid":1,"updated_by_id":null,"last_edited_by_id":null,"lock_version":0,"start_date":null,"end_date":null,"last_edited_at":null,"created_at":"2019-11-20T17:02:09.754Z","updated_at":"2019-11-20T18:38:40.054Z","title":"Provident neque consequatur numquam ad laboriosam voluptatem magnam.","description":"Fugit nisi est ut numquam quia rerum vitae qui. Et in est aliquid voluptas et ut vitae. In distinctio voluptates ut deleniti iste.\n\nReiciendis eum sunt vero blanditiis at quia. Voluptate eum facilis illum ea distinctio maiores. Doloribus aut nemo ea distinctio.\n\nNihil cum distinctio voluptates quam. Laboriosam distinctio ea accusantium soluta perspiciatis nesciunt impedit. Id qui natus quis minima voluptatum velit ut reprehenderit. Molestiae quia est harum sapiente rem error architecto id. Et minus ipsa et ut ut.","start_date_sourcing_milestone_id":null,"due_date_sourcing_milestone_id":null,"start_date_fixed":null,"due_date_fixed":null,"start_date_is_fixed":null,"due_date_is_fixed":null,"closed_by_id":null,"closed_at":null,"parent_id":null,"relative_position":null,"state":"opened","start_date_sourcing_epic_id":null,"due_date_sourcing_epic_id":null,"notes":[{"id":44164,"note":"added epic &2 as child epic","noteable_type":"Epic","author_id":1,"created_at":"2019-11-20T18:38:26.689Z","updated_at":"2019-11-20T18:38:26.724Z","project_id":null,"attachment":{"url":null},"line_code":null,"commit_id":null,"noteable_id":13622,"system":true,"st_diff":null,"updated_by_id":null,"position":null,"original_position":null,"resolved_at":null,"resolved_by_id":null,"discussion_id":"133f0c3001860fa8d2031e398a65db74477378c4","change_position":null,"resolved_by_push":null,"review_id":null,"type":null,"author":{"name":"Administrator"},"award_emoji":[{"id":12,"name":"drum","user_id":1,"awardable_type":"Note","awardable_id":44170,"created_at":"2019-11-05T15:32:21.287Z","updated_at":"2019-11-05T15:32:21.287Z"}]}],"award_emoji":[{"id":12,"name":"thumbsup","user_id":1,"awardable_type":"Epic","awardable_id":13622,"created_at":"2019-11-05T15:37:21.287Z","updated_at":"2019-11-05T15:37:21.287Z"}],"label_links":[{"id":1,"label_id":2,"target_id":3,"target_type":"Epic","created_at":"2021-04-14 14:42:21.717503","updated_at":"2021-04-14 14:42:21.717503","label":{"title":"title","description":"description","color":"#cd2c5c","created_at":"2021-04-14 14:42:21.717503","updated_at":"2021-04-14 14:42:21.717503","type":"GroupLabel"}}]}
{"id":13623,"milestone_id":null,"group_id":4351,"author_id":1,"assignee_id":null,"iid":2,"updated_by_id":null,"last_edited_by_id":null,"lock_version":0,"start_date":null,"end_date":null,"last_edited_at":null,"created_at":"2019-12-20T17:02:09.754Z","updated_at":"2019-12-20T18:38:40.054Z","title":"Provident neque consequatur numquam ad voluptatem magnam.","description":"Fugit nisi","start_date_sourcing_milestone_id":null,"due_date_sourcing_milestone_id":null,"start_date_fixed":null,"due_date_fixed":null,"start_date_is_fixed":null,"due_date_is_fixed":null,"closed_by_id":null,"closed_at":null,"parent_id":null,"relative_position":null,"state":"closed","start_date_sourcing_epic_id":null,"due_date_sourcing_epic_id":null,"notes":[],"label_links":[{"id":1,"label_id":2,"target_id":3,"target_type":"Epic","created_at":"2021-04-14 14:42:21.717503","updated_at":"2021-04-14 14:42:21.717503","label":{"title":"title","description":"description","color":"#cd2c5c","created_at":"2021-04-14 14:42:21.717503","updated_at":"2021-04-14 14:42:21.717503","type":"GroupLabel"}}]} {"id":13623,"milestone_id":null,"group_id":4351,"author_id":1,"assignee_id":null,"iid":2,"updated_by_id":null,"last_edited_by_id":null,"lock_version":0,"start_date":null,"end_date":null,"last_edited_at":null,"created_at":"2019-12-20T17:02:09.754Z","updated_at":"2019-12-20T18:38:40.054Z","title":"Provident neque consequatur numquam ad voluptatem magnam.","description":"Fugit nisi","start_date_sourcing_milestone_id":null,"due_date_sourcing_milestone_id":null,"start_date_fixed":null,"due_date_fixed":null,"start_date_is_fixed":null,"due_date_is_fixed":null,"closed_by_id":null,"closed_at":null,"parent_id":null,"relative_position":null,"state":"closed","start_date_sourcing_epic_id":null,"due_date_sourcing_epic_id":null,"notes":[],"label_links":[{"id":1,"label_id":2,"target_id":3,"target_type":"Epic","created_at":"2021-04-14 14:42:21.717503","updated_at":"2021-04-14 14:42:21.717503","label":{"title":"title","description":"description","color":"#cd2c5c","created_at":"2021-04-14 14:42:21.717503","updated_at":"2021-04-14 14:42:21.717503","type":"GroupLabel"}}]}
{"id":17527,"group_id":1277,"author_id":1,"assignee_id":null,"iid":3,"updated_by_id":null,"last_edited_by_id":null,"lock_version":0,"start_date":null,"end_date":null,"last_edited_at":null,"created_at":"2021-06-08T14:49:25.041Z","updated_at":"2021-06-08T14:49:43.877Z","title":"system notes","description":"system notes","start_date_sourcing_milestone_id":null,"due_date_sourcing_milestone_id":null,"start_date_fixed":null,"due_date_fixed":null,"start_date_is_fixed":false,"due_date_is_fixed":false,"closed_by_id":null,"closed_at":null,"parent_id":null,"relative_position":null,"state_id":"opened","start_date_sourcing_epic_id":null,"due_date_sourcing_epic_id":null,"confidential":false,"external_key":null,"notes":[{"id":529568,"note":"added epic u00261 as child epic","noteable_type":"Epic","author_id":1,"created_at":"2021-06-08T14:49:43.774Z","updated_at":"2021-06-08T14:49:43.811Z","project_id":null,"attachment":{"url":null},"line_code":null,"commit_id":null,"noteable_id":17527,"system":true,"st_diff":null,"updated_by_id":null,"position":null,"original_position":null,"resolved_at":null,"resolved_by_id":null,"discussion_id":"63c7b8f0862ebde74eb806a2fd0d84bd53734730","change_position":null,"resolved_by_push":null,"review_id":null,"confidential":null,"last_edited_at":"2021-06-08T14:49:43.811Z","system_note_metadata":{"id":196422,"note_id":529568,"commit_count":null,"action":"relate_epic","created_at":"2021-06-08T14:49:43.843Z","updated_at":"2021-06-08T14:49:43.843Z","description_version_id":null},"author":{"id":1,"email":"","created_at":"2021-04-14T14:42:15.926Z","updated_at":"2021-06-08T16:32:26.109Z","name":"Administrator"},"award_emoji":[]}]}
...@@ -6,7 +6,7 @@ RSpec.describe BulkImports::Groups::Pipelines::EpicsPipeline do ...@@ -6,7 +6,7 @@ RSpec.describe BulkImports::Groups::Pipelines::EpicsPipeline do
let_it_be(:user) { create(:user) } let_it_be(:user) { create(:user) }
let_it_be(:group) { create(:group) } let_it_be(:group) { create(:group) }
let_it_be(:bulk_import) { create(:bulk_import, user: user) } let_it_be(:bulk_import) { create(:bulk_import, user: user) }
let_it_be(:filepath) { 'spec/fixtures/bulk_imports/epics.ndjson.gz' } let_it_be(:filepath) { 'ee/spec/fixtures/bulk_imports/gz/epics.ndjson.gz' }
let_it_be(:entity) do let_it_be(:entity) do
create( create(
:bulk_import_entity, :bulk_import_entity,
...@@ -32,19 +32,30 @@ RSpec.describe BulkImports::Groups::Pipelines::EpicsPipeline do ...@@ -32,19 +32,30 @@ RSpec.describe BulkImports::Groups::Pipelines::EpicsPipeline do
subject { described_class.new(context) } subject { described_class.new(context) }
describe '#run' do describe '#run' do
it 'imports group epics into destination group' do before do
allow(Dir).to receive(:mktmpdir).and_return(tmpdir) allow(Dir).to receive(:mktmpdir).and_return(tmpdir)
allow_next_instance_of(BulkImports::FileDownloadService) do |service| allow_next_instance_of(BulkImports::FileDownloadService) do |service|
allow(service).to receive(:execute) allow(service).to receive(:execute)
end end
expect { subject.run }.to change(::Epic, :count).by(5) subject.run
end
it 'imports group epics into destination group' do
expect(group.epics.count).to eq(6)
end
it 'imports epic award emoji' do
expect(group.epics.first.award_emoji.first.name).to eq('thumbsup') expect(group.epics.first.award_emoji.first.name).to eq('thumbsup')
end
it 'imports epic notes' do
expect(group.epics.first.state).to eq('opened') expect(group.epics.first.state).to eq('opened')
expect(group.epics.first.notes.count).to eq(4) expect(group.epics.first.notes.count).to eq(4)
expect(group.epics.first.notes.first.award_emoji.first.name).to eq('drum') expect(group.epics.first.notes.first.award_emoji.first.name).to eq('drum')
end
it 'imports epic labels' do
label = group.epics.first.labels.first label = group.epics.first.labels.first
expect(group.epics.first.labels.count).to eq(1) expect(group.epics.first.labels.count).to eq(1)
...@@ -52,6 +63,13 @@ RSpec.describe BulkImports::Groups::Pipelines::EpicsPipeline do ...@@ -52,6 +63,13 @@ RSpec.describe BulkImports::Groups::Pipelines::EpicsPipeline do
expect(label.description).to eq('description') expect(label.description).to eq('description')
expect(label.color).to eq('#cd2c5c') expect(label.color).to eq('#cd2c5c')
end end
it 'imports epic system note metadata' do
note = group.epics.find_by_title('system notes').notes.first
expect(note.system).to eq(true)
expect(note.system_note_metadata.action).to eq('relate_epic')
end
end end
describe '#load' do describe '#load' do
......
...@@ -21,26 +21,34 @@ RSpec.describe Gitlab::ImportExport::Group::TreeRestorer do ...@@ -21,26 +21,34 @@ RSpec.describe Gitlab::ImportExport::Group::TreeRestorer do
describe 'restore group tree' do describe 'restore group tree' do
context 'epics' do context 'epics' do
it 'has group epics' do it 'has group epics' do
expect(group.epics.count).to eq(2) expect(group.epics.count).to eq(3)
end end
it 'has award emoji' do it 'has award emoji' do
expect(group.epics.first.award_emoji.first.name).to eq('thumbsup') expect(group.epics.find_by_iid(1).award_emoji.first.name).to eq('thumbsup')
end end
it 'preserves epic state' do it 'preserves epic state' do
expect(group.epics.first.state).to eq('opened') expect(group.epics.find_by_iid(1).state).to eq('opened')
expect(group.epics.last.state).to eq('closed') expect(group.epics.find_by_iid(2).state).to eq('closed')
expect(group.epics.find_by_iid(3).state).to eq('opened')
end end
end end
context 'epic notes' do context 'epic notes' do
it 'has epic notes' do it 'has epic notes' do
expect(group.epics.first.notes.count).to eq(1) expect(group.epics.find_by_iid(1).notes.count).to eq(1)
end end
it 'has award emoji on epic notes' do it 'has award emoji on epic notes' do
expect(group.epics.first.notes.first.award_emoji.first.name).to eq('drum') expect(group.epics.find_by_iid(1).notes.first.award_emoji.first.name).to eq('drum')
end
it 'has system note metadata' do
note = group.epics.find_by_title('system notes').notes.first
expect(note.system).to eq(true)
expect(note.system_note_metadata.action).to eq('relate_epic')
end end
end end
......
...@@ -77,6 +77,7 @@ ee: ...@@ -77,6 +77,7 @@ ee:
- :award_emoji - :award_emoji
- events: - events:
- :push_event_payload - :push_event_payload
- :system_note_metadata
- boards: - boards:
- :board_assignee - :board_assignee
- :milestone - :milestone
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment