diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-10 12:07:55 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-10 12:07:55 +0000 |
| commit | 5e11c9b77cb1b2b77ee29359047b55807afe255d (patch) | |
| tree | 40b02dead6acdcaab9cc15efc9ae4710c2ed78a8 /spec/fixtures | |
| parent | 97d4d926630822d0e1a638206909679c962d2f0a (diff) | |
| download | gitlab-ce-5e11c9b77cb1b2b77ee29359047b55807afe255d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/error_tracking/error_detailed.json | 2 | ||||
| -rw-r--r-- | spec/fixtures/lib/gitlab/import_export/complex/project.json | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/spec/fixtures/api/schemas/error_tracking/error_detailed.json b/spec/fixtures/api/schemas/error_tracking/error_detailed.json index 40d6773f0e6..2a1cd2c03e0 100644 --- a/spec/fixtures/api/schemas/error_tracking/error_detailed.json +++ b/spec/fixtures/api/schemas/error_tracking/error_detailed.json @@ -13,6 +13,7 @@ "short_id", "status", "frequency", + "gitlab_issue", "first_release_last_commit", "last_release_last_commit", "first_release_short_version", @@ -36,6 +37,7 @@ "short_id": { "type": "string"}, "status": { "type": "string"}, "frequency": { "type": "array"}, + "gitlab_issue": { "type": ["string", "null"] }, "first_release_last_commit": { "type": ["string", "null"] }, "last_release_last_commit": { "type": ["string", "null"] }, "first_release_short_version": { "type": ["string", "null"] }, diff --git a/spec/fixtures/lib/gitlab/import_export/complex/project.json b/spec/fixtures/lib/gitlab/import_export/complex/project.json index 8dc91b05f4d..acfd6a6924a 100644 --- a/spec/fixtures/lib/gitlab/import_export/complex/project.json +++ b/spec/fixtures/lib/gitlab/import_export/complex/project.json @@ -366,7 +366,12 @@ "type": "ProjectLabel" } } - ] + ], + "sentry_issue": { + "id": 1, + "issue_id": 40, + "sentry_issue_identifier": 1234567891 + } }, { "id": 39, |