Merge branch 'revert-daa72ac8' into 'master'

Revert "Add expand/collapse button to operation settings"

See merge request gitlab-org/gitlab-ce!28818

app/assets/javascripts/operation_settings/components/external_dashboard.vue

@@ -1,6 +1,5 @@
 <script>
 import { GlButton, GlFormGroup, GlFormInput, GlLink } from '@gitlab/ui';
-import initSettingsPanels from '~/settings_panels';
 
 export default {
   components: {
@@ -20,19 +19,15 @@ export default {
       required: true,
     },
   },
-  mounted() {
-    initSettingsPanels();
-  },
 };
 </script>
 
 <template>
-  <section class="settings no-animate">
+  <section class="settings expanded">
     <div class="settings-header">
       <h4 class="js-section-header">
         {{ s__('ExternalMetrics|External Dashboard') }}
       </h4>
-      <gl-button class="js-settings-toggle">{{ __('Expand') }}</gl-button>
       <p class="js-section-sub-header">
         {{
           s__(

spec/frontend/operation_settings/components/external_dashboard_spec.js

@@ -2,9 +2,6 @@ import { shallowMount } from '@vue/test-utils';
 import { GlButton, GlLink, GlFormGroup, GlFormInput } from '@gitlab/ui';
 import ExternalDashboard from '~/operation_settings/components/external_dashboard.vue';
 import { TEST_HOST } from 'helpers/test_constants';
-import initSettingsPanels from '~/settings_panels';
-
-jest.mock('~/settings_panels');
 
 describe('operation settings external dashboard component', () => {
   let wrapper;
@@ -24,18 +21,6 @@ describe('operation settings external dashboard component', () => {
     expect(wrapper.find('.js-section-header').text()).toBe('External Dashboard');
   });
 
-  describe('expand/collapse button', () => {
-    it('is properly instantiated as a settings panel', () => {
-      expect(initSettingsPanels).toHaveBeenCalled();
-    });
-
-    it('defaults to collapsed state', () => {
-      const button = wrapper.find(GlButton);
-
-      expect(button.text()).toBe('Expand');
-    });
-  });
-
   describe('sub-header', () => {
     let subHeader;