diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-09-03 12:07:39 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-09-03 12:07:39 +0300 |
| commit | 91ed0dbc8cd96b63e5fca32fc127df9262b2dcd2 (patch) | |
| tree | 1081a00ec39876e34610abe0e299814f71320777 /spec/fixtures | |
| parent | b5be01bc1fb3dc075eb7a73ef55098ecd5515234 (diff) | |
| parent | 5bc54ca425866c37f6cdf6448d8ae2dcbabea3bf (diff) | |
Merge branch 'issue_48084' into 'master'
Use a serializer to render diff lines
Closes #48084
See merge request gitlab-org/gitlab-ce!21260
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/entities/diff_line.json | 14 | ||||
| -rw-r--r-- | spec/fixtures/api/schemas/entities/diff_line_parallel.json | 11 |
2 files changed, 25 insertions, 0 deletions
diff --git a/spec/fixtures/api/schemas/entities/diff_line.json b/spec/fixtures/api/schemas/entities/diff_line.json new file mode 100644 index 00000000000..66e8b443e1b --- /dev/null +++ b/spec/fixtures/api/schemas/entities/diff_line.json @@ -0,0 +1,14 @@ +{ + "type": "object", + "required": ["type"], + "properties": { + "line_code": { "type": ["string", "null"] }, + "type": { "type": ["string", "null"] }, + "old_line": { "type": ["integer", "null"] }, + "new_line": { "type": ["integer", "null"] }, + "text": { "type": ["string"] }, + "rich_text": { "type": ["string"] }, + "meta_data": { "type": ["object", "null"] } + }, + "additionalProperties": false +} diff --git a/spec/fixtures/api/schemas/entities/diff_line_parallel.json b/spec/fixtures/api/schemas/entities/diff_line_parallel.json new file mode 100644 index 00000000000..f924eb0c601 --- /dev/null +++ b/spec/fixtures/api/schemas/entities/diff_line_parallel.json @@ -0,0 +1,11 @@ +{ + "required" : [ + "left", + "right" + ], + "properties" : { + "left": { "$ref": "diff_line.json" }, + "right": { "$ref": "diff_line.json" } + }, + "additionalProperties": false +} |