diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-16 12:09:37 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-16 12:09:37 +0300 |
| commit | 513eff621044e77bc00cd1b4ae0cb5e0e7c2e77e (patch) | |
| tree | 1de915ccc488a661129b410db83ad9f20a7c806c /app/views/projects/settings | |
| parent | 1ab35c9208287638a097abc895738fbc0c0860e6 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/settings')
| -rw-r--r-- | app/views/projects/settings/operations/_prometheus.html.haml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/views/projects/settings/operations/_prometheus.html.haml b/app/views/projects/settings/operations/_prometheus.html.haml index 3d7a6b021a8..b0fa750e131 100644 --- a/app/views/projects/settings/operations/_prometheus.html.haml +++ b/app/views/projects/settings/operations/_prometheus.html.haml @@ -13,7 +13,5 @@ %b.append-bottom-default = s_('PrometheusService|Manual configuration') - - - unless service.editable? - .info-well - = s_('PrometheusService|To enable manual configuration, uninstall Prometheus from your clusters') + %p + = s_('PrometheusService|Select the Active checkbox to override the Auto Configuration with custom settings. If unchecked, Auto Configuration settings are used.') |