diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-18 12:06:03 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-18 12:06:03 +0000 |
| commit | 16d9f66e9651d35b52e5a167789befe7b861292c (patch) | |
| tree | 38ffe73aeffa5bc8ceaa3357db302edce6d874f6 /spec/fixtures | |
| parent | 5333cb6c7c960aac58af40c898c87d050d829383 (diff) | |
| download | gitlab-ce-16d9f66e9651d35b52e5a167789befe7b861292c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/entities/merge_request_sidebar_extras.json | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/fixtures/api/schemas/entities/merge_request_sidebar_extras.json b/spec/fixtures/api/schemas/entities/merge_request_sidebar_extras.json index 682e345d5f5..11076ec73de 100644 --- a/spec/fixtures/api/schemas/entities/merge_request_sidebar_extras.json +++ b/spec/fixtures/api/schemas/entities/merge_request_sidebar_extras.json @@ -3,6 +3,8 @@ "properties" : { "id": { "type": "integer" }, "iid": { "type": "integer" }, + "project_emails_disabled": { "type": "boolean" }, + "subscribe_disabled_description": { "type": "string" }, "subscribed": { "type": "boolean" }, "time_estimate": { "type": "integer" }, "total_time_spent": { "type": "integer" }, |