diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /app/assets/javascripts/integrations/edit/components/active_toggle.vue | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/assets/javascripts/integrations/edit/components/active_toggle.vue')
-rw-r--r-- | app/assets/javascripts/integrations/edit/components/active_toggle.vue | 37 |
1 files changed, 10 insertions, 27 deletions
diff --git a/app/assets/javascripts/integrations/edit/components/active_toggle.vue b/app/assets/javascripts/integrations/edit/components/active_toggle.vue index a3087c8958e..e6a96600539 100644 --- a/app/assets/javascripts/integrations/edit/components/active_toggle.vue +++ b/app/assets/javascripts/integrations/edit/components/active_toggle.vue @@ -1,8 +1,7 @@ <script> import { mapGetters } from 'vuex'; -import eventHub from '../event_hub'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { GlFormGroup, GlToggle } from '@gitlab/ui'; +import eventHub from '../event_hub'; export default { name: 'ActiveToggle', @@ -10,7 +9,6 @@ export default { GlFormGroup, GlToggle, }, - mixins: [glFeatureFlagsMixin()], props: { initialActivated: { type: Boolean, @@ -40,28 +38,13 @@ export default { </script> <template> - <div v-if="glFeatures.integrationFormRefactor"> - <gl-form-group :label="__('Enable integration')" label-for="service[active]"> - <gl-toggle - v-model="activated" - name="service[active]" - class="gl-display-block gl-line-height-0" - :disabled="isInheriting" - @change="onToggle" - /> - </gl-form-group> - </div> - <div v-else> - <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" - name="service[active]" - :disabled="isInheriting" - @change="onToggle" - /> - </div> - </div> - </div> + <gl-form-group :label="__('Enable integration')" label-for="service[active]"> + <gl-toggle + v-model="activated" + name="service[active]" + class="gl-display-block gl-line-height-0" + :disabled="isInheriting" + @change="onToggle" + /> + </gl-form-group> </template> |