diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-05-29 15:42:59 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-05-29 15:42:59 +0000 |
| commit | e79f91df8c2a38238ebe5c76862d2f35307bb7f5 (patch) | |
| tree | 14f6370b8a79f4cf6de1652f763da9fbd49f6faf /doc/api | |
| parent | 58c50d40524e0b0c23d4c5d7782583e3742047ba (diff) | |
| parent | 1c5106fadfe59ec4af7235b94d424e4367185c2e (diff) | |
| download | gitlab-ce-e79f91df8c2a38238ebe5c76862d2f35307bb7f5.tar.gz | |
Merge branch '46758-fallout-of-cacheable-attribute' into 'master'
Ensure ApplicationSetting#performance_bar_allowed_group_id is properly set when retrieved from cache
Closes #46758
See merge request gitlab-org/gitlab-ce!19144
Diffstat (limited to 'doc/api')
| -rw-r--r-- | doc/api/settings.md | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/api/settings.md b/doc/api/settings.md index 1ebfe4924b1..36a0782d8f2 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -55,6 +55,7 @@ Example response: "ed25519_key_restriction": 0, "enforce_terms": true, "terms": "Hello world!", + "performance_bar_allowed_group_id": 42 } ``` @@ -120,8 +121,9 @@ PUT /application/settings | `metrics_timeout` | integer | yes (if `metrics_enabled` is `true`) | The amount of seconds after which InfluxDB will time out. | | `password_authentication_enabled_for_web` | boolean | no | Enable authentication for the web interface via a GitLab account password. Default is `true`. | | `password_authentication_enabled_for_git` | boolean | no | Enable authentication for Git over HTTP(S) via a GitLab account password. Default is `true`. | -| `performance_bar_allowed_group_id` | string | no | The group that is allowed to enable the performance bar | -| `performance_bar_enabled` | boolean | no | Allow enabling the performance bar | +| `performance_bar_allowed_group_path` | string | no | Path of the group that is allowed to toggle the performance bar | +| `performance_bar_allowed_group_id` | string | no | Deprecated: Use `performance_bar_allowed_group_path` instead. Path of the group that is allowed to toggle the performance bar | +| `performance_bar_enabled` | boolean | no | Deprecated: Pass `performance_bar_allowed_group_path: nil` instead. Allow enabling the performance bar | | `plantuml_enabled` | boolean | no | Enable PlantUML integration. Default is `false`. | | `plantuml_url` | string | yes (if `plantuml_enabled` is `true`) | The PlantUML instance URL for integration. | | `polling_interval_multiplier` | decimal | no | Interval multiplier used by endpoints that perform polling. Set to 0 to disable polling. | @@ -201,5 +203,6 @@ Example response: "ed25519_key_restriction": 0, "enforce_terms": true, "terms": "Hello world!", + "performance_bar_allowed_group_id": 42 } ``` |