Update text to match UX changes

2 files changed, 46 insertions, 20 deletions

diff --git a/app/views/projects/settings/operations/show.html.haml b/app/views/projects/settings/operations/show.html.haml
index 5b607a654ae..650a5909e02 100644
--- a/app/views/projects/settings/operations/show.html.haml
+++ b/app/views/projects/settings/operations/show.html.haml
@@ -2,23 +2,25 @@
 - page_title _('Operations')
 
 - if Feature.enabled?(:error_tracking, @project)
-  %section.settings.expanded
-    .settings-header
-      %h4
-        = _('Error Tracking')
-      %p
-        = _('To link Sentry to GitLab, enter your Sentry URL and bearer token')
-    .settings-content
-      = form_for @error_tracking_setting, as: :error_tracking_setting, url: namespace_project_settings_operations_error_tracking_path(@project.namespace, @project), method: :post do |f|
-        = form_errors(@error_tracking_setting)
-        .form-group
-          %div.form-check
-            = f.check_box :enabled
-            = f.label :enabled, _('Active')
-        .form-group
-          = f.label :uri, _('Sentry API URL'), class: 'label-bold'
-          = f.url_field :uri, class: 'form-control', placeholder: _('http://<sentry-host>/api/0/projects/<organization>/<project>')
-        .form-group
-          = f.label :token, _('Bearer token'), class: 'label-bold'
-          = f.text_field :token, class: 'form-control', placeholder: _('Hint token')
-        %input.btn.btn-success{:type => 'submit', :value => _('Save changes')}
+  %section
+    %h4
+      = _('Error Tracking')
+    %p
+      = _('To link Sentry to GitLab, enter your Sentry URL and Auth Token.')
+    = form_for @error_tracking_setting, as: :error_tracking_setting, url: namespace_project_settings_operations_error_tracking_path(@project.namespace, @project), method: :post do |f|
+      = form_errors(@error_tracking_setting)
+      .form-group
+        %div.form-check
+          = f.check_box :enabled, class: 'form-check-input'
+          = f.label :enabled, _('Active'), class: 'form-check-label'
+      .form-group
+        = f.label :uri, _('Sentry API URL'), class: 'label-bold'
+        = f.url_field :uri, class: 'form-control', placeholder: _('http://<sentry-host>/api/0/projects/{organization_slug}/{project_slug}/issues/')
+        %p.form-text.text-muted
+          = _('Enter your Sentry API URL')
+      .form-group
+        = f.label :token, _('Auth Token'), class: 'label-bold'
+        = f.text_field :token, class: 'form-control'
+        %p.form-text.text-muted
+          = _('Find and manage Auth Tokens in your Sentry account settings page.')
+      %input.btn.btn-success{:type => 'submit', :value => _('Save changes')}
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index ddfd5599883..30452636eb1 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -765,6 +765,9 @@ msgstr ""
 msgid "August"
 msgstr ""
 
+msgid "Auth Token"
+msgstr ""
+
 msgid "Authentication Log"
 msgstr ""
 
@@ -2755,6 +2758,9 @@ msgstr ""
 msgid "Enter the merge request title"
 msgstr ""
 
+msgid "Enter your Sentry API URL"
+msgstr ""
+
 msgid "Environment variables"
 msgstr ""
 
@@ -2857,6 +2863,9 @@ msgstr ""
 msgid "Error Reporting and Logging"
 msgstr ""
 
+msgid "Error Tracking"
+msgstr ""
+
 msgid "Error fetching contributors data."
 msgstr ""
 
@@ -3079,6 +3088,9 @@ msgstr ""
 msgid "Filter..."
 msgstr ""
 
+msgid "Find and manage Auth Tokens in your Sentry account settings page."
+msgstr ""
+
 msgid "Find by path"
 msgstr ""
 
@@ -5967,6 +5979,9 @@ msgstr ""
 msgid "Send usage data"
 msgstr ""
 
+msgid "Sentry API URL"
+msgstr ""
+
 msgid "Sep"
 msgstr ""
 
@@ -7089,6 +7104,9 @@ msgstr ""
 msgid "To import an SVN repository, check out %{svn_link}."
 msgstr ""
 
+msgid "To link Sentry to GitLab, enter your Sentry URL and Auth Token."
+msgstr ""
+
 msgid "To move or copy an entire GitLab project from another GitLab installation to this one, navigate to the original project's settings page, generate an export file, and upload it here."
 msgstr ""
 
@@ -7809,6 +7827,9 @@ msgstr ""
 msgid "Your changes have been committed. Commit %{commitId} %{commitStats}"
 msgstr ""
 
+msgid "Your changes have been saved"
+msgstr ""
+
 msgid "Your comment will not be visible to the public."
 msgstr ""
 
@@ -7897,6 +7918,9 @@ msgstr ""
 msgid "here"
 msgstr ""
 
+msgid "http://<sentry-host>/api/0/projects/{organization_slug}/{project_slug}/issues/"
+msgstr ""
+
 msgid "https://your-bitbucket-server"
 msgstr ""