Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
8d10add4
Commit
8d10add4
authored
Apr 17, 2017
by
Sean McGivern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't show usage ping on settings page
parent
ae833a8b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
9 deletions
+10
-9
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+1
-2
app/assets/javascripts/main.js
app/assets/javascripts/main.js
+1
-0
app/assets/javascripts/usage_ping.js
app/assets/javascripts/usage_ping.js
+1
-1
app/views/admin/application_settings/_form.html.haml
app/views/admin/application_settings/_form.html.haml
+6
-5
app/views/admin/cohorts/_usage_ping.html.haml
app/views/admin/cohorts/_usage_ping.html.haml
+1
-1
No files found.
app/assets/javascripts/dispatcher.js
View file @
8d10add4
...
@@ -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
();
...
...
app/assets/javascripts/main.js
View file @
8d10add4
...
@@ -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
'
;
...
...
app/assets/javascripts/
application_settings.js.es6
→
app/assets/javascripts/
usage_ping.js
View file @
8d10add4
(
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
({
...
...
app/views/admin/application_settings/_form.html.haml
View file @
8d10add4
...
@@ -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
...
...
app/views/admin/cohorts/_usage_ping.html.haml
View file @
8d10add4
%h2
Usage ping
%h2
#usage-ping
Usage ping
.bs-callout.clearfix
.bs-callout.clearfix
%p
%p
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment