Merge branch 'tr-separate-operations-settings-page' into 'master'

Update tracing settings to match error tracking

See merge request gitlab-org/gitlab-ee!8786

ee/app/views/projects/settings/operations/_tracing.html.haml

@@ -3,30 +3,32 @@
 - setting = tracing_setting
 - has_jaeger_url = setting.external_url.present?
 
-%section
-  %h4
-    = _("Jaeger tracing")
-  %p
-    - if has_jaeger_url
-      - tracing_link = link_to sanitize(@project.tracing_external_url, tags: []), target: "_blank", rel: 'noopener noreferrer' do
-        %span
-          = _('Tracing')
-          = sprite_icon('external-link', size: 16, css_class: 'ml-1 vertical-align-middle')
-    - else
-      - tracing_link = link_to project_tracing_path(@project) do
-        %span
-          = _('Tracing')
-    = _("To open Jaeger and easily view tracing from GitLab, link the %{link} page to your server").html_safe % { link: tracing_link }
-  = form_for @project, url: project_settings_operations_path(@project), method: :patch do |f|
-    = form_errors(@project)
-    .form-group
-      = f.fields_for :tracing_setting_attributes, setting do |form|
-        = form.label :external_url, _('Jaeger URL'), class: 'label-bold'
-        = form.url_field :external_url, class: 'form-control', placeholder: 'e.g. https://jaeger.mycompany.com'
-        %p.form-text.text-muted
-          - jaeger_help_url = "https://www.jaegertracing.io/docs/1.7/getting-started/"
-          - link_start_tag = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: jaeger_help_url }
-          - link_end_tag = "#{sprite_icon('external-link', size: 16, css_class: 'ml-1 vertical-align-middle')}</a>".html_safe
-          = _("For more information, please review %{link_start_tag}Jaeger's configuration doc%{link_end_tag}").html_safe % { link_start_tag: link_start_tag, link_end_tag: link_end_tag }
+%section.settings.expanded.border-0.no-animate
+  .settings-header{ :class => ("border-top" unless not Feature.enabled?(:error_tracking, @project)) }
+    %h4
+      = _("Jaeger tracing")
+    %p
+      - if has_jaeger_url
+        - tracing_link = link_to sanitize(@project.tracing_external_url, tags: []), target: "_blank", rel: 'noopener noreferrer' do
+          %span
+            = _('Tracing')
+            = sprite_icon('external-link', size: 16, css_class: 'ml-1 vertical-align-middle')
+      - else
+        - tracing_link = link_to project_tracing_path(@project) do
+          %span
+            = _('Tracing')
+      = _("To open Jaeger and easily view tracing from GitLab, link the %{link} page to your server").html_safe % { link: tracing_link }
+  .settings-content
+    = form_for @project, url: project_settings_operations_path(@project), method: :patch do |f|
+      = form_errors(@project)
+      .form-group
+        = f.fields_for :tracing_setting_attributes, setting do |form|
+          = form.label :external_url, _('Jaeger URL'), class: 'label-bold'
+          = form.url_field :external_url, class: 'form-control', placeholder: 'e.g. https://jaeger.mycompany.com'
+          %p.form-text.text-muted
+            - jaeger_help_url = "https://www.jaegertracing.io/docs/1.7/getting-started/"
+            - link_start_tag = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: jaeger_help_url }
+            - link_end_tag = "#{sprite_icon('external-link', size: 16, css_class: 'ml-1 vertical-align-middle')}</a>".html_safe
+            = _("For more information, please review %{link_start_tag}Jaeger's configuration doc%{link_end_tag}").html_safe % { link_start_tag: link_start_tag, link_end_tag: link_end_tag }
 
-    = f.submit _('Save changes'), class: 'btn btn-success'
+      = f.submit _('Save changes'), class: 'btn btn-success'

ee/changelogs/unreleased/tr-separate-operations-settings-page.yml

+---
+title: Update tracing settings to match error tracking settings
+merge_request: 8786
+author:
+type: other