diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-07 16:31:20 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-07 16:31:20 +0300 |
| commit | 7e7f260dc54c7643e8d7ec8bf3fbded3dfc06fcc (patch) | |
| tree | cc36768e2e801a5b4b259e2aa1f996bee7308f9c /app/views | |
| parent | fc65f56399796c2b6698597f5df3d8ea343d1a77 (diff) | |
| parent | 921c59a373da63e92c1dda52096e821fdfcef7bb (diff) | |
Merge branch '43486-update-language-about-version-check-in-admin-settings-and-docs' into 'master'
Resolve "Update language about version check in admin settings and docs"
Closes #43486
See merge request gitlab-org/gitlab-ce!17535
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index 68788134b8e..81d7db04a3c 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -657,9 +657,11 @@ .checkbox = f.label :version_check_enabled do = f.check_box :version_check_enabled - Version check enabled + Enable version check .help-block - Let GitLab inform you when an update is available. + GitLab will inform you if a new version is available. + = link_to 'Learn more', help_page_path("user/admin_area/settings/usage_statistics", anchor: "version-check") + about what information is shared with GitLab Inc. .form-group .col-sm-offset-2.col-sm-10 - can_be_configured = @application_setting.usage_ping_can_be_configured? |