Commit 8d10add4 authored by Sean McGivern's avatar Sean McGivern

Don't show usage ping on settings page

parent ae833a8b
...@@ -365,9 +365,8 @@ const ShortcutsBlob = require('./shortcuts_blob'); ...@@ -365,9 +365,8 @@ const ShortcutsBlob = require('./shortcuts_blob');
case 'admin': case 'admin':
new Admin(); new Admin();
switch (path[1]) { switch (path[1]) {
case 'application_settings':
case 'cohorts': case 'cohorts':
new gl.ApplicationSettings(); new gl.UsagePing();
break; break;
case 'groups': case 'groups':
new UsersSelect(); new UsersSelect();
......
...@@ -165,6 +165,7 @@ import './syntax_highlight'; ...@@ -165,6 +165,7 @@ import './syntax_highlight';
import './task_list'; import './task_list';
import './todos'; import './todos';
import './tree'; import './tree';
import './usage_ping';
import './user'; import './user';
import './user_tabs'; import './user_tabs';
import './username_validator'; import './username_validator';
......
(global => { (global => {
global.gl = global.gl || {}; global.gl = global.gl || {};
gl.ApplicationSettings = function() { gl.UsagePing = function() {
var usage_data_url = $('.usage-data').data('endpoint'); var usage_data_url = $('.usage-data').data('endpoint');
$.ajax({ $.ajax({
......
...@@ -493,11 +493,12 @@ ...@@ -493,11 +493,12 @@
= f.check_box :usage_ping_enabled = f.check_box :usage_ping_enabled
Usage ping enabled 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-data")
.container .help-block
.help-block Every week GitLab will report license usage back to GitLab, Inc.
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
Disable this option if you do not want this to occur. This is the JSON payload that will be sent: JSON payload that will be sent, visit the
%pre.usage-data.js-syntax-highlight.code.highlight{ "data-endpoint" => usage_data_admin_application_settings_path(format: :html) } = succeed '.' do
= link_to "Cohorts page", admin_cohorts_path(anchor: 'usage-ping')
%fieldset %fieldset
%legend Email %legend Email
......
%h2 Usage ping %h2#usage-ping Usage ping
.bs-callout.clearfix .bs-callout.clearfix
%p %p
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment