diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-06 16:47:27 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-06 16:47:27 +0000 |
| commit | a68a39e34120e0cf67d95e143326d03f61288cdf (patch) | |
| tree | d979ff0c94c6b78a4c19e55fda18b1f2c88ba852 /spec/fixtures | |
| parent | 8c4dea25d4b76d75d83d22b9925d784ec09b46f9 (diff) | |
| parent | 26f6065ec686d16a053e33f031779a8e75f0c5c9 (diff) | |
| download | gitlab-ce-a68a39e34120e0cf67d95e143326d03f61288cdf.tar.gz | |
Merge branch '18608-lock-issues-v2' into 'master'
Resolve "Lock issue and merge request"
Closes #18608
See merge request gitlab-org/gitlab-ce!14531
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/issues.json | 1 | ||||
| -rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/merge_requests.json | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/spec/fixtures/api/schemas/public_api/v4/issues.json b/spec/fixtures/api/schemas/public_api/v4/issues.json index 03c422ab023..5c08dbc3b96 100644 --- a/spec/fixtures/api/schemas/public_api/v4/issues.json +++ b/spec/fixtures/api/schemas/public_api/v4/issues.json @@ -9,6 +9,7 @@ "title": { "type": "string" }, "description": { "type": ["string", "null"] }, "state": { "type": "string" }, + "discussion_locked": { "type": ["boolean", "null"] }, "closed_at": { "type": "date" }, "created_at": { "type": "date" }, "updated_at": { "type": "date" }, diff --git a/spec/fixtures/api/schemas/public_api/v4/merge_requests.json b/spec/fixtures/api/schemas/public_api/v4/merge_requests.json index 31b3f4ba946..5828be5255b 100644 --- a/spec/fixtures/api/schemas/public_api/v4/merge_requests.json +++ b/spec/fixtures/api/schemas/public_api/v4/merge_requests.json @@ -72,6 +72,7 @@ "user_notes_count": { "type": "integer" }, "should_remove_source_branch": { "type": ["boolean", "null"] }, "force_remove_source_branch": { "type": ["boolean", "null"] }, + "discussion_locked": { "type": ["boolean", "null"] }, "web_url": { "type": "uri" }, "time_stats": { "time_estimate": { "type": "integer" }, |