diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-02 13:47:32 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-02 13:47:32 +0000 |
| commit | cbefd38f9c71cc2346b83c4050b03c9cb702864a (patch) | |
| tree | 98a29ca9de4f894a469689045bcf81e6de762f8b | |
| parent | 40c61acb6a9ba84928cebcbce8b57630bd439615 (diff) | |
| parent | b9f9b306c1a154cc7893ddfdad3ce2b915795acf (diff) | |
| download | gitlab-ce-cbefd38f9c71cc2346b83c4050b03c9cb702864a.tar.gz | |
Merge branch '43548-update-language-about-usage-ping-in-admin-settings-and-docs' into 'master'
Resolve "Update language about usage ping in admin settings"
Closes #43548
See merge request gitlab-org/gitlab-ce!17468
| -rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index b89b7a9ff85..68788134b8e 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -666,15 +666,15 @@ .checkbox = f.label :usage_ping_enabled do = f.check_box :usage_ping_enabled, disabled: !can_be_configured - Usage ping enabled - = link_to icon('question-circle'), help_page_path("user/admin_area/settings/usage_statistics", anchor: "usage-ping") + Enable usage ping .help-block - if can_be_configured - Every week GitLab will report license usage back to GitLab, Inc. - Disable this option if you do not want this to occur. To see the - JSON payload that will be sent, visit the - = succeed '.' do - = link_to "Cohorts page", admin_cohorts_path(anchor: 'usage-ping') + To help improve GitLab and its user experience, GitLab will + periodically collect usage information. + = link_to 'Learn more', help_page_path("user/admin_area/settings/usage_statistics", anchor: "usage-ping") + about what information is shared with GitLab Inc. Visit + = link_to 'Cohorts', admin_cohorts_path(anchor: 'usage-ping') + to see the JSON payload sent. - else The usage ping is disabled, and cannot be configured through this form. For more information, see the documentation on |