summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-10-24 17:31:09 +0000
committerThiago Presa <tpresa@gitlab.com>2018-10-31 23:56:19 -0300
commit391f80df9e4cd4cb76719382cad0b3ce6c51fade (patch)
tree960b50d1f56cc63eeb9d0f4e38a3ee5f70afd609
parentf19ae85a0351c756e382ed9881900a9b5a0aa3b2 (diff)
downloadgitlab-ce-391f80df9e4cd4cb76719382cad0b3ce6c51fade.tar.gz
Merge branch '53070-fix-usage-ping-link' into 'master'
Fix usage ping link Closes #53070 See merge request gitlab-org/gitlab-ce!22545
-rw-r--r--app/views/instance_statistics/conversational_development_index/_disabled.html.haml2
-rw-r--r--changelogs/unreleased/53070-fix-enable-usage-ping-link.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/instance_statistics/conversational_development_index/_disabled.html.haml b/app/views/instance_statistics/conversational_development_index/_disabled.html.haml
index 0a5717f75e1..b854e15d36f 100644
--- a/app/views/instance_statistics/conversational_development_index/_disabled.html.haml
+++ b/app/views/instance_statistics/conversational_development_index/_disabled.html.haml
@@ -11,4 +11,4 @@
%p
= _('Enable usage ping to get an overview of how you are using GitLab from a feature perspective.')
- if current_user.admin?
- = link_to _('Enable usage ping'), admin_application_settings_path(anchor: 'usage-statistics'), class: 'btn btn-primary'
+ = link_to _('Enable usage ping'), metrics_and_profiling_admin_application_settings_path(anchor: 'js-usage-settings'), class: 'btn btn-primary'
diff --git a/changelogs/unreleased/53070-fix-enable-usage-ping-link.yml b/changelogs/unreleased/53070-fix-enable-usage-ping-link.yml
new file mode 100644
index 00000000000..605d3679159
--- /dev/null
+++ b/changelogs/unreleased/53070-fix-enable-usage-ping-link.yml
@@ -0,0 +1,5 @@
+---
+title: "fix link to enable usage ping from convdev index"
+merge_request: 22545
+author: Anand Capur
+type: fixed