Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 4 deletions

diff --git a/app/views/admin/application_settings/_snowplow.html.haml b/app/views/admin/application_settings/_snowplow.html.haml
index 5daf220d81c..8c98778147e 100644
--- a/app/views/admin/application_settings/_snowplow.html.haml
+++ b/app/views/admin/application_settings/_snowplow.html.haml
@@ -6,7 +6,8 @@
     %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
       = expanded ? _('Collapse') : _('Expand')
     %p
-      = _('Configure the %{link} integration.').html_safe % { link: link_to('Snowplow', 'https://snowplowanalytics.com/', target: '_blank') }
+      - link_start = '<a href="%{url}">'.html_safe % { url: help_page_path('development/snowplow/index') }
+      = html_escape(_('Configure %{link} to track events. %{link_start}Learn more.%{link_end}')) % { link: link_to('Snowplow', 'https://snowplowanalytics.com/', target: '_blank').html_safe, link_start: link_start, link_end: '</a>'.html_safe }
   .settings-content
     = form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-snowplow-settings'), html: { class: 'fieldset-form', id: 'snowplow-settings' } do |f|
       = form_errors(@application_setting) if expanded
@@ -15,15 +16,21 @@
         .form-group
           .form-check
             = f.check_box :snowplow_enabled, class: 'form-check-input'
-            = f.label :snowplow_enabled, _('Enable snowplow tracking'), class: 'form-check-label'
+            = f.label :snowplow_enabled, _('Enable Snowplow tracking'), class: 'form-check-label'
         .form-group
           = f.label :snowplow_collector_hostname, _('Collector hostname'), class: 'label-light'
           = f.text_field :snowplow_collector_hostname, class: 'form-control gl-form-input', placeholder: 'snowplow.example.com'
+          .form-text.text-muted
+            = _('The hostname of your Snowplow collector.')
         .form-group
           = f.label :snowplow_app_id, _('App ID'), class: 'label-light'
-          = f.text_field :snowplow_app_id, class: 'form-control gl-form-input'
+          = f.text_field :snowplow_app_id, class: 'form-control gl-form-input', placeholder: 'gitlab'
+          .form-text.text-muted
+            = _('The ID of the application.')
         .form-group
           = f.label :snowplow_cookie_domain, _('Cookie domain'), class: 'label-light'
-          = f.text_field :snowplow_cookie_domain, class: 'form-control gl-form-input'
+          = f.text_field :snowplow_cookie_domain, class: 'form-control gl-form-input', placeholder: '.your-gitlab-instance.com'
+          .form-text.text-muted
+            = _('The Snowplow cookie domain.')
 
       = f.submit _('Save changes'), class: 'gl-button btn btn-confirm'