diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/assets/javascripts/integrations/edit/components/active_toggle.vue | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-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 | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/app/assets/javascripts/integrations/edit/components/active_toggle.vue b/app/assets/javascripts/integrations/edit/components/active_toggle.vue index 8b95b04d93c..dc89e139320 100644 --- a/app/assets/javascripts/integrations/edit/components/active_toggle.vue +++ b/app/assets/javascripts/integrations/edit/components/active_toggle.vue @@ -1,12 +1,15 @@ <script> import eventHub from '../event_hub'; -import { GlToggle } from '@gitlab/ui'; +import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; +import { GlFormGroup, GlToggle } from '@gitlab/ui'; export default { name: 'ActiveToggle', components: { + GlFormGroup, GlToggle, }, + mixins: [glFeatureFlagsMixin()], props: { initialActivated: { type: Boolean, @@ -33,7 +36,17 @@ export default { </script> <template> - <div> + <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" + @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"> |