Merge branch 'mg-keep-admin-settings-expanded' into 'master'

Keep admin settings sections expanded after submitting form

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

app/views/admin/application_settings/show.html.haml

@@ -370,7 +370,7 @@
       %button.btn.js-settings-toggle{ type: 'button' }
         = expanded ? 'Collapse' : 'Expand'
       %p
-        = _('Geo allows you to replicate your GitLab instance to other geographical locations.')
+        = _('Slack integration allows you to interact with GitLab via shash commands in a chat window.')
     .settings-content
       = render partial: 'slack'
 

ee/app/views/admin/application_settings/_custom_templates_form.html.haml

 - if ::Gitlab::CurrentSettings.custom_project_templates_enabled?
-  %section.settings.as-custom-project-templates.no-animate#js-mirror-settings{ class: ('expanded' if expanded) }
+  %section.settings.as-custom-project-templates.no-animate#js-custom-project-templates-settings{ class: ('expanded' if expanded) }
     .settings-header
       %h4
         = _('Custom project templates')
@@ -9,7 +9,7 @@
         = _('Select the custom project template source group.')
     .settings-content
 
-      = form_for @application_setting, url: admin_application_settings_path do |f|
+      = form_for @application_setting, url: admin_application_settings_path(anchor: 'js-custom-project-templates-settings') do |f|
         = form_errors(@application_setting)
 
         %fieldset

ee/app/views/admin/application_settings/_elasticsearch_form.html.haml

-= form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f|
+= form_for @application_setting, url: admin_application_settings_path(anchor: 'js-elasticsearch-settings'), html: { class: 'fieldset-form' } do |f|
   = form_errors(@application_setting)
 
   %fieldset

ee/app/views/admin/application_settings/_external_authorization_service_form.html.haml

-= form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f|
+= form_for @application_setting, url: admin_application_settings_path(anchor: 'js-external-auth-settings'), html: { class: 'fieldset-form' } do |f|
   = form_errors(@application_setting)
 
   %fieldset

ee/app/views/admin/application_settings/_geo.html.haml

-= form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f|
+= form_for @application_setting, url: admin_application_settings_path(anchor: 'js-geo-settings'), html: { class: 'fieldset-form' } do |f|
   = form_errors(@application_setting)
 
   %fieldset

ee/app/views/admin/application_settings/_pseudonymizer.html.haml

-= form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f|
+= form_for @application_setting, url: admin_application_settings_path(anchor: 'js-pseudonymizer-settings'), html: { class: 'fieldset-form' } do |f|
   = form_errors(@application_setting)
 
   %fieldset

ee/app/views/admin/application_settings/_slack.html.haml

-= form_for @application_setting, url: admin_application_settings_path, html: { class: 'fieldset-form' } do |f|
+= form_for @application_setting, url: admin_application_settings_path(anchor: 'js-slack-settings'), html: { class: 'fieldset-form' } do |f|
   = form_errors(@application_setting)
 
   %fieldset

locale/gitlab.pot

@@ -6318,6 +6318,9 @@ msgstr ""
 msgid "Slack application"
 msgstr ""
 
+msgid "Slack integration allows you to interact with GitLab via shash commands in a chat window."
+msgstr ""
+
 msgid "Slower but makes sure the project workspace is pristine as it clones the repository from scratch for every job"
 msgstr ""