diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-01-11 19:06:01 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-01-11 19:06:01 +0300 |
| commit | 7acabf7c5908940665e1a8c4e3d09d423385657a (patch) | |
| tree | fad4bd291a00b986a3e79ad3c47f6ed5b870ed01 /spec/fixtures | |
| parent | 0668f54b0a77f8dc6b7891ebd3755965bb6136ff (diff) | |
| parent | e5c49b57c35e5fe923b0fe29e1863cc29d6cf619 (diff) | |
Merge branch 'remove-soft-removals' into 'master'
Remove soft removals related code
Closes #37447
See merge request gitlab-org/gitlab-ce!15789
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/entities/issue.json | 1 | ||||
| -rw-r--r-- | spec/fixtures/api/schemas/entities/merge_request_widget.json | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/spec/fixtures/api/schemas/entities/issue.json b/spec/fixtures/api/schemas/entities/issue.json index 3d3329a3406..38467b4ca20 100644 --- a/spec/fixtures/api/schemas/entities/issue.json +++ b/spec/fixtures/api/schemas/entities/issue.json @@ -28,7 +28,6 @@ "confidential": { "type": "boolean" }, "discussion_locked": { "type": ["boolean", "null"] }, "updated_by_id": { "type": ["string", "null"] }, - "deleted_at": { "type": ["string", "null"] }, "time_estimate": { "type": "integer" }, "total_time_spent": { "type": "integer" }, "human_time_estimate": { "type": ["integer", "null"] }, diff --git a/spec/fixtures/api/schemas/entities/merge_request_widget.json b/spec/fixtures/api/schemas/entities/merge_request_widget.json index 7f662098216..05461787f06 100644 --- a/spec/fixtures/api/schemas/entities/merge_request_widget.json +++ b/spec/fixtures/api/schemas/entities/merge_request_widget.json @@ -13,7 +13,6 @@ "updated_by_id": { "type": ["string", "null"] }, "created_at": { "type": "string" }, "updated_at": { "type": "string" }, - "deleted_at": { "type": ["string", "null"] }, "time_estimate": { "type": "integer" }, "total_time_spent": { "type": "integer" }, "human_time_estimate": { "type": ["integer", "null"] }, |