summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-04-25 13:22:43 +0000
committerRémy Coutable <remy@rymai.me>2017-04-25 13:22:43 +0000
commit04811cbbff15c7b40d679a81f0c920216f873824 (patch)
tree635a176c0498cbfa566ece38af25a6a21be18a17
parent3bf46c84ed8fe419eaf4f6f6cefe1424854baf44 (diff)
parent08a864e2d9246d655599a26e9e1f7ff8642b7849 (diff)
downloadgitlab-ce-04811cbbff15c7b40d679a81f0c920216f873824.tar.gz
Merge branch 'fix-usage-ping-doc-link' into 'master'
Fix usage ping docs link from empty cohorts page See merge request !10907
-rw-r--r--app/views/admin/cohorts/index.html.haml2
-rw-r--r--changelogs/unreleased/fix-usage-ping-doc-link.yml4
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/admin/cohorts/index.html.haml b/app/views/admin/cohorts/index.html.haml
index 46fe12a5a99..be8644c0ca6 100644
--- a/app/views/admin/cohorts/index.html.haml
+++ b/app/views/admin/cohorts/index.html.haml
@@ -9,7 +9,7 @@
.bs-callout.bs-callout-warning.clearfix
%p
User cohorts are only shown when the
- = link_to 'usage ping', help_page_path('user/admin_area/usage_statistics'), target: '_blank'
+ = link_to 'usage ping', help_page_path('user/admin_area/settings/usage_statistics', anchor: 'usage-ping'), target: '_blank'
is enabled. To enable it and see user cohorts,
visit
= succeed '.' do
diff --git a/changelogs/unreleased/fix-usage-ping-doc-link.yml b/changelogs/unreleased/fix-usage-ping-doc-link.yml
new file mode 100644
index 00000000000..5217a4e4e4b
--- /dev/null
+++ b/changelogs/unreleased/fix-usage-ping-doc-link.yml
@@ -0,0 +1,4 @@
+---
+title: Fix usage ping docs link from empty cohorts page
+merge_request:
+author: