Merge branch 'psimyn-operations-collapse-settings' into 'master'

Add Collapse buttons to Operations settings

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

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

@@ -4,9 +4,11 @@
 - setting = project_incident_management_setting
 - templates = setting.available_issue_templates.map { |t| [t.name, t.key] }
 
-%section.settings.expanded.no-animate
+%section.settings.no-animate
   .settings-header
     %h4= _('Incidents')
+    %button.btn.js-settings-toggle{ type: 'button' }
+      = _('Expand')
     %p
       = _('Action to take when receiving an alert.')
       = link_to help_page_path('user/project/integrations/prometheus', anchor: 'taking-action-on-an-alert-ultimate') do

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

@@ -3,10 +3,12 @@
 - setting = tracing_setting
 - has_jaeger_url = setting.external_url.present?
 
-%section.settings.expanded.border-0.no-animate
+%section.settings.border-0.no-animate
   .settings-header{ :class => "border-top" }
     %h4
       = _("Jaeger tracing")
+    %button.btn.js-settings-toggle{ type: 'button' }
+      = _('Expand')
     %p
       - if has_jaeger_url
         - tracing_link = link_to sanitize(@project.tracing_external_url, scrubber: Rails::Html::TextOnlyScrubber.new), target: "_blank", rel: 'noopener noreferrer' do

ee/changelogs/unreleased/psimyn-operations-collapse-settings.yml

+---
+title: Add Collapse buttons to Operations settings
+merge_request: 15117
+author:
+type: added