diff options
author | Robert Speicher <robert@gitlab.com> | 2017-05-12 19:16:40 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-05-12 19:16:40 +0000 |
commit | b012c0b3164e58b55c9860ea6874b76491669a40 (patch) | |
tree | 85732fd1be1a1d233c2582a52676bc7f2dbcf630 /app/views | |
parent | 2d83e4c5d15cdfd8da71be6ee0d5746b8ec9ef99 (diff) | |
parent | f0b3ed91bc87117194578cfc5f58849886b5a97d (diff) | |
download | gitlab-ce-b012c0b3164e58b55c9860ea6874b76491669a40.tar.gz |
Merge branch 'disable-usage-ping' into 'master'
Usage ping updates
Closes #31741 and #31453
See merge request !11231
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/admin/application_settings/_form.html.haml | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index 4b6628169ef..e1b4e34cd2b 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -502,17 +502,24 @@ Let GitLab inform you when an update is available. .form-group .col-sm-offset-2.col-sm-10 + - can_be_configured = @application_setting.usage_ping_can_be_configured? .checkbox = f.label :usage_ping_enabled do - = f.check_box :usage_ping_enabled + = 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-data") + = link_to icon('question-circle'), help_page_path("user/admin_area/settings/usage_statistics", anchor: "usage-ping") .help-block - 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') + - 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') + - else + The usage ping is disabled, and cannot be configured through this + form. For more information, see the documentation on + = succeed '.' do + = link_to 'deactivating the usage ping', help_page_path('user/admin_area/settings/usage_statistics', anchor: 'deactivate-the-usage-ping') %fieldset %legend Email |