diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-31 03:09:13 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-31 03:09:13 +0300 |
| commit | a1ed98e0c8c0562591bca710649b3ecca0a320d7 (patch) | |
| tree | 8b486e33ba345111b3e1f84066ff951937cb02be /spec/fixtures | |
| parent | c8f773a8593926f4f2dec6f446a3b3e59e9c9909 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/lib/gitlab/import_export/group_exports/complex/group.json | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/spec/fixtures/lib/gitlab/import_export/group_exports/complex/group.json b/spec/fixtures/lib/gitlab/import_export/group_exports/complex/group.json index b48386a3fb9..edfc6333a24 100644 --- a/spec/fixtures/lib/gitlab/import_export/group_exports/complex/group.json +++ b/spec/fixtures/lib/gitlab/import_export/group_exports/complex/group.json @@ -482,7 +482,18 @@ "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, @@ -574,6 +585,17 @@ "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" + } ] }, { |