summaryrefslogtreecommitdiff
path: root/spec/fixtures
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-03 09:09:31 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-03 09:09:31 +0000
commit04baa85554ff13bdd4d6f4e6bb24119d17608fee (patch)
tree7cb9c0977e09d97da340f48703d79b2dbd3579a0 /spec/fixtures
parent42f41de46525ce0065f02ee07c1a79f5669526a0 (diff)
downloadgitlab-ce-04baa85554ff13bdd4d6f4e6bb24119d17608fee.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures')
-rw-r--r--spec/fixtures/lib/gitlab/import_export/complex/project.json78
-rw-r--r--spec/fixtures/lib/gitlab/import_export/light/project.json40
2 files changed, 118 insertions, 0 deletions
diff --git a/spec/fixtures/lib/gitlab/import_export/complex/project.json b/spec/fixtures/lib/gitlab/import_export/complex/project.json
index 97baf5cdd39..4bf72fe6912 100644
--- a/spec/fixtures/lib/gitlab/import_export/complex/project.json
+++ b/spec/fixtures/lib/gitlab/import_export/complex/project.json
@@ -2493,6 +2493,84 @@
"merge_commit_sha": null,
"notes": [
{
+ "id": 669,
+ "note": "added 3 commits\n\n<ul><li>16ea4e20...074a2a32 - 2 commits from branch <code>master</code></li><li>ca223a02 - readme: fix typos</li></ul>\n\n[Compare with previous version](/group/project/merge_requests/1/diffs?diff_id=1189&start_sha=16ea4e207fb258fe4e9c73185a725207c9a4f3e1)",
+ "noteable_type": "MergeRequest",
+ "author_id": 26,
+ "created_at": "2020-03-28T12:47:33.461Z",
+ "updated_at": "2020-03-28T12:47:33.461Z",
+ "project_id": 5,
+ "attachment": {
+ "url": null
+ },
+ "line_code": null,
+ "commit_id": null,
+ "system": true,
+ "st_diff": null,
+ "updated_by_id": null,
+ "position": null,
+ "original_position": null,
+ "resolved_at": null,
+ "resolved_by_id": null,
+ "discussion_id": null,
+ "change_position": null,
+ "resolved_by_push": null,
+ "confidential": null,
+ "type": null,
+ "author": {
+ "name": "User 4"
+ },
+ "award_emoji": [],
+ "system_note_metadata": {
+ "id": 4789,
+ "commit_count": 3,
+ "action": "commit",
+ "created_at": "2020-03-28T12:47:33.461Z",
+ "updated_at": "2020-03-28T12:47:33.461Z"
+ },
+ "events": [],
+ "suggestions": []
+ },
+ {
+ "id": 670,
+ "note": "unmarked as a **Work In Progress**",
+ "noteable_type": "MergeRequest",
+ "author_id": 26,
+ "created_at": "2020-03-28T12:48:36.951Z",
+ "updated_at": "2020-03-28T12:48:36.951Z",
+ "project_id": 5,
+ "attachment": {
+ "url": null
+ },
+ "line_code": null,
+ "commit_id": null,
+ "system": true,
+ "st_diff": null,
+ "updated_by_id": null,
+ "position": null,
+ "original_position": null,
+ "resolved_at": null,
+ "resolved_by_id": null,
+ "discussion_id": null,
+ "change_position": null,
+ "resolved_by_push": null,
+ "confidential": null,
+ "type": null,
+ "author": {
+ "name": "User 4"
+ },
+ "award_emoji": [],
+ "system_note_metadata": {
+ "id": 4790,
+ "commit_count": null,
+ "action": "title",
+ "created_at": "2020-03-28T12:48:36.951Z",
+ "updated_at": "2020-03-28T12:48:36.951Z"
+ },
+ "events": [],
+ "suggestions": []
+ },
+ {
"id": 671,
"note": "Sit voluptatibus eveniet architecto quidem.",
"note_html": "<p>something else entirely</p>",
diff --git a/spec/fixtures/lib/gitlab/import_export/light/project.json b/spec/fixtures/lib/gitlab/import_export/light/project.json
index ad0fc59326b..eaed8565a18 100644
--- a/spec/fixtures/lib/gitlab/import_export/light/project.json
+++ b/spec/fixtures/lib/gitlab/import_export/light/project.json
@@ -98,6 +98,46 @@
"priorities": []
}
}
+ ],
+ "notes": [
+ {
+ "id": 20,
+ "note": "created merge request !1 to address this issue",
+ "noteable_type": "Issue",
+ "author_id": 1,
+ "created_at": "2020-03-28T01:37:42.307Z",
+ "updated_at": "2020-03-28T01:37:42.307Z",
+ "project_id": 8,
+ "attachment": {
+ "url": null
+ },
+ "line_code": null,
+ "commit_id": null,
+ "system": true,
+ "st_diff": null,
+ "updated_by_id": null,
+ "position": null,
+ "original_position": null,
+ "resolved_at": null,
+ "resolved_by_id": null,
+ "discussion_id": null,
+ "change_position": null,
+ "resolved_by_push": null,
+ "confidential": null,
+ "type": null,
+ "author": {
+ "name": "Author"
+ },
+ "award_emoji": [],
+ "system_note_metadata": {
+ "id": 21,
+ "commit_count": null,
+ "action": "merge",
+ "created_at": "2020-03-28T01:37:42.307Z",
+ "updated_at": "2020-03-28T01:37:42.307Z"
+ },
+ "events": []
+ }
]
}
],