Remove unused form for admin application settings

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

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

-= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f|
-  = form_errors(@application_setting)
-
-  - if License.feature_available?(:repository_mirrors)
-    = render partial: 'repository_mirrors_form', locals: { f: f }
-
-  = render partial: 'elasticsearch_form', locals: { f: f }
-
-  - if Gitlab.com? || Rails.env.development?
-    %fieldset
-      %legend Slack application
-      .form-group
-        .col-sm-offset-2.col-sm-10
-          .checkbox
-            = f.label :slack_app_enabled do
-              = f.check_box :slack_app_enabled
-              Enable Slack application
-            .help-block
-              This option is only available on GitLab.com
-      .form-group
-        = f.label :slack_app_id, 'APP_ID', class: 'control-label col-sm-2'
-        .col-sm-10
-          = f.text_field :slack_app_id, class: 'form-control'
-      .form-group
-        = f.label :slack_app_secret, 'APP_SECRET', class: 'control-label col-sm-2'
-        .col-sm-10
-          = f.text_field :slack_app_secret, class: 'form-control'
-      .form-group
-        = f.label :slack_app_verification_token, 'Verification token', class: 'control-label col-sm-2'
-        .col-sm-10
-          = f.text_field :slack_app_verification_token, class: 'form-control'
-
-  - if Gitlab::Geo.license_allows?
-    %fieldset
-      %legend GitLab Geo
-      %p
-        These settings will only take effect if Geo is enabled and require a restart to take effect.
-      .form-group
-        = f.label :geo_status_timeout, 'Connection timeout', class: 'control-label col-sm-2'
-        .col-sm-10
-          = f.number_field :geo_status_timeout, class: 'form-control'
-          .help-block
-            The amount of seconds after which a request to get a secondary node
-            status will time out.
-
-  - if License.feature_available?(:external_authorization_service)
-    = render partial: 'external_authorization_service_form', locals: { f: f }
-
-  .form-actions
-    = f.submit 'Save', class: 'btn btn-save'

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

@@ -303,5 +303,29 @@
   .settings-content
     = render 'outbound'
 
-.prepend-top-20
-  = render 'form'
+-# EE-only
+- if Gitlab::Geo.license_allows?
+  %section.settings.as-geo.no-animate#js-geo-settings{ class: ('expanded' if expanded) }
+    .settings-header
+      %h4
+        = _('GitLab Geo')
+      %button.btn.js-settings-toggle{ type: 'button' }
+        = expanded ? 'Collapse' : 'Expand'
+      %p
+        = _('Geo allows you to replicate your GitLab instance to other geographical locations.')
+    .settings-content
+      = render 'geo'
+
+- if License.feature_available?(:external_authorization_service)
+  = render partial: 'external_authorization_service_form', locals: { f: f }
+
+- if License.feature_available?(:repository_mirrors)
+  = render partial: 'repository_mirrors_form', locals: { f: f }
+
+- if License.feature_available?(:elastic_search)
+  = render partial: 'elasticsearch_form', locals: { f: f }
+
+- if Gitlab.com? || Rails.env.development?
+  %fieldset
+    %legend Slack application
+  = render partial: 'slack', locals: { f: f }

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

-- if License.feature_available?(:elastic_search)
-  %fieldset
-    %legend Elasticsearch
-    .form-group
-      .col-sm-offset-2.col-sm-10
-        .checkbox
-          = f.label :elasticsearch_indexing do
-            = f.check_box :elasticsearch_indexing
-            Elasticsearch indexing
-
-    - missing = !Gitlab::Elastic::Indexer.experimental_indexer_present?
-    .form-group
-      .col-sm-offset-2.col-sm-10
-        .checkbox
-          = f.label :elasticsearch_experimental_indexer do
-            = f.check_box :elasticsearch_experimental_indexer, disabled: missing
-            Use <a href="https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer">experimental repository indexer</a>
-            - if missing
-              (not installed)
-
-    .form-group
-      .col-sm-offset-2.col-sm-10
-        .checkbox
-          = f.label :elasticsearch_search do
-            = f.check_box :elasticsearch_search
-            Search with Elasticsearch enabled
-
-    .form-group
-      = f.label :elasticsearch_url, 'URL', class: 'control-label col-sm-2'
-      .col-sm-10
-        = f.text_field :elasticsearch_url, value: @application_setting.elasticsearch_url.join(', '), class: 'form-control', placeholder: 'http://localhost:9200'
-        .help-block
-          The url to use for connecting to Elasticsearch. Use a comma-separated list to support clustering (e.g., "http://localhost:9200, http://localhost:9201").
+= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f|
+  = form_errors(@application_setting)
 
   %fieldset
-    %legend Elasticsearch AWS IAM credentials
-    .form-group
-      .col-sm-offset-2.col-sm-10
-        .checkbox
-          = f.label :elasticsearch_aws do
-            = f.check_box :elasticsearch_aws
-            Using AWS hosted Elasticsearch with IAM credentials
-    .form-group
-      = f.label :elasticsearch_aws_region, 'AWS region', class: 'control-label col-sm-2'
-      .col-sm-10
-        = f.text_field :elasticsearch_aws_region, value: @application_setting.elasticsearch_aws_region, class: 'form-control'
-        .help-block
-          Region that elasticsearch is configured
-
-    .form-group
-      = f.label :elasticsearch_aws_access_key, 'AWS Access Key', class: 'control-label col-sm-2'
-      .col-sm-10
-        = f.text_field :elasticsearch_aws_access_key, value: @application_setting.elasticsearch_aws_access_key, class: 'form-control'
-        .help-block
-          AWS Access Key.  Only required if not using role instance credentials
-
-    .form-group
-      = f.label :elasticsearch_aws_secret_access_key, 'AWS Secret Access Key', class: 'control-label col-sm-2'
-      .col-sm-10
-        = f.password_field :elasticsearch_aws_secret_access_key, value: @application_setting.elasticsearch_aws_secret_access_key, class: 'form-control'
-        .help-block
-          AWS Secret Access Key.  Only required if not using role instance credentials
+    .sub-section
+      .form-group
+        .col-sm-offset-2.col-sm-10
+          .checkbox
+            = f.label :elasticsearch_indexing do
+              = f.check_box :elasticsearch_indexing
+              Elasticsearch indexing
+
+      - missing = !Gitlab::Elastic::Indexer.experimental_indexer_present?
+      .form-group
+        .col-sm-offset-2.col-sm-10
+          .checkbox
+            = f.label :elasticsearch_experimental_indexer do
+              = f.check_box :elasticsearch_experimental_indexer, disabled: missing
+              Use <a href="https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer">experimental repository indexer</a>
+              - if missing
+                (not installed)
+
+      .form-group
+        .col-sm-offset-2.col-sm-10
+          .checkbox
+            = f.label :elasticsearch_search do
+              = f.check_box :elasticsearch_search
+              Search with Elasticsearch enabled
+
+      .form-group
+        = f.label :elasticsearch_url, 'URL', class: 'control-label col-sm-2'
+        .col-sm-10
+          = f.text_field :elasticsearch_url, value: @application_setting.elasticsearch_url.join(', '), class: 'form-control', placeholder: 'http://localhost:9200'
+          .help-block
+            The url to use for connecting to Elasticsearch. Use a comma-separated list to support clustering (e.g., "http://localhost:9200, http://localhost:9201").
+
+    .sub-section
+      %h4 Elasticsearch AWS IAM credentials
+      .form-group
+        .col-sm-offset-2.col-sm-10
+          .checkbox
+            = f.label :elasticsearch_aws do
+              = f.check_box :elasticsearch_aws
+              Using AWS hosted Elasticsearch with IAM credentials
+      .form-group
+        = f.label :elasticsearch_aws_region, 'AWS region', class: 'control-label col-sm-2'
+        .col-sm-10
+          = f.text_field :elasticsearch_aws_region, value: @application_setting.elasticsearch_aws_region, class: 'form-control'
+          .help-block
+            Region that elasticsearch is configured
+
+      .form-group
+        = f.label :elasticsearch_aws_access_key, 'AWS Access Key', class: 'control-label col-sm-2'
+        .col-sm-10
+          = f.text_field :elasticsearch_aws_access_key, value: @application_setting.elasticsearch_aws_access_key, class: 'form-control'
+          .help-block
+            AWS Access Key.  Only required if not using role instance credentials
+
+      .form-group
+        = f.label :elasticsearch_aws_secret_access_key, 'AWS Secret Access Key', class: 'control-label col-sm-2'
+        .col-sm-10
+          = f.password_field :elasticsearch_aws_secret_access_key, value: @application_setting.elasticsearch_aws_secret_access_key, class: 'form-control'
+          .help-block
+            AWS Secret Access Key.  Only required if not using role instance credentials
+
+  = f.submit 'Save changes', class: "btn btn-success"

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

+= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f|
+  = form_errors(@application_setting)
+
+  %fieldset
+    %p
+      These settings will only take effect if Geo is enabled and require a restart to take effect.
+    .form-group
+      = f.label :geo_status_timeout, 'Connection timeout', class: 'control-label col-sm-2'
+      .col-sm-10
+        = f.number_field :geo_status_timeout, class: 'form-control'
+        .help-block
+          The amount of seconds after which a request to get a secondary node
+          status will time out.
+
+  = f.submit 'Save changes', class: "btn btn-success"

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

+= form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f|
+  = form_errors(@application_setting)
+
+  %fieldset
+    .form-group
+      .col-sm-offset-2.col-sm-10
+        .checkbox
+          = f.label :slack_app_enabled do
+            = f.check_box :slack_app_enabled
+            Enable Slack application
+          .help-block
+            This option is only available on GitLab.com
+    .form-group
+      = f.label :slack_app_id, 'APP_ID', class: 'control-label col-sm-2'
+      .col-sm-10
+        = f.text_field :slack_app_id, class: 'form-control'
+    .form-group
+      = f.label :slack_app_secret, 'APP_SECRET', class: 'control-label col-sm-2'
+      .col-sm-10
+        = f.text_field :slack_app_secret, class: 'form-control'
+    .form-group
+      = f.label :slack_app_verification_token, 'Verification token', class: 'control-label col-sm-2'
+      .col-sm-10
+        = f.text_field :slack_app_verification_token, class: 'form-control'
+
+  = f.submit 'Save changes', class: "btn btn-success"