Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 13 deletions

diff --git a/app/assets/javascripts/integrations/edit/components/active_toggle.vue b/app/assets/javascripts/integrations/edit/components/active_toggle.vue
index 2b0aa2586e4..8b95b04d93c 100644
--- a/app/assets/javascripts/integrations/edit/components/active_toggle.vue
+++ b/app/assets/javascripts/integrations/edit/components/active_toggle.vue
@@ -12,10 +12,6 @@ export default {
       type: Boolean,
       required: true,
     },
-    disabled: {
-      type: Boolean,
-      required: true,
-    },
   },
   data() {
     return {
@@ -41,12 +37,7 @@ export default {
     <div class="form-group row" role="group">
       <label for="service[active]" class="col-form-label col-sm-2">{{ __('Active') }}</label>
       <div class="col-sm-10 pt-1">
-        <gl-toggle
-          v-model="activated"
-          :disabled="disabled"
-          name="service[active]"
-          @change="onToggle"
-        />
+        <gl-toggle v-model="activated" name="service[active]" @change="onToggle" />
       </div>
     </div>
   </div>
diff --git a/app/assets/javascripts/integrations/edit/index.js b/app/assets/javascripts/integrations/edit/index.js
index a2ba581d429..25ae6015f1d 100644
--- a/app/assets/javascripts/integrations/edit/index.js
+++ b/app/assets/javascripts/integrations/edit/index.js
@@ -7,10 +7,9 @@ export default el => {
     return null;
   }
 
-  const { showActive: showActiveStr, activated: activatedStr, disabled: disabledStr } = el.dataset;
+  const { showActive: showActiveStr, activated: activatedStr } = el.dataset;
   const showActive = parseBoolean(showActiveStr);
   const activated = parseBoolean(activatedStr);
-  const disabled = parseBoolean(disabledStr);
 
   if (!showActive) {
     return null;
@@ -22,7 +21,6 @@ export default el => {
       return createElement(ActiveToggle, {
         props: {
           initialActivated: activated,
-          disabled,
         },
       });
     },