diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-21 06:09:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-21 06:09:21 +0300 |
commit | f0fc9fc7153d2949a416001aa19cf16bb7f7ab89 (patch) | |
tree | f06510693dd6b5a4f3f8e08d8b98d4ac04511e11 /app/assets/javascripts/integrations | |
parent | 339a04aba21a61487ea800b018868598c041e90c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/integrations')
-rw-r--r-- | app/assets/javascripts/integrations/edit/components/active_toggle.vue | 35 | ||||
-rw-r--r-- | app/assets/javascripts/integrations/edit/components/jira_trigger_fields.vue | 73 |
2 files changed, 10 insertions, 98 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..3fd7fbec87f 100644 --- a/app/assets/javascripts/integrations/edit/components/active_toggle.vue +++ b/app/assets/javascripts/integrations/edit/components/active_toggle.vue @@ -1,7 +1,6 @@ <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'; export default { @@ -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> diff --git a/app/assets/javascripts/integrations/edit/components/jira_trigger_fields.vue b/app/assets/javascripts/integrations/edit/components/jira_trigger_fields.vue index 1d3354c6651..f1c2927aead 100644 --- a/app/assets/javascripts/integrations/edit/components/jira_trigger_fields.vue +++ b/app/assets/javascripts/integrations/edit/components/jira_trigger_fields.vue @@ -1,5 +1,4 @@ <script> -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { mapGetters } from 'vuex'; import { s__ } from '~/locale'; import { GlFormGroup, GlFormCheckbox, GlFormRadio } from '@gitlab/ui'; @@ -26,7 +25,6 @@ export default { GlFormCheckbox, GlFormRadio, }, - mixins: [glFeatureFlagsMixin()], props: { initialTriggerCommit: { type: Boolean, @@ -65,7 +63,7 @@ export default { </script> <template> - <div v-if="glFeatures.integrationFormRefactor"> + <div> <gl-form-group :label="__('Trigger')" label-for="service[trigger]" @@ -130,73 +128,4 @@ export default { </gl-form-radio> </gl-form-group> </div> - - <div v-else class="form-group row pt-2" role="group"> - <label for="service[trigger]" class="col-form-label col-sm-2 pt-0">{{ __('Trigger') }}</label> - <div class="col-sm-10"> - <label class="weight-normal mb-2"> - {{ - s__( - 'Integrations|When a Jira issue is mentioned in a commit or merge request a remote link and comment (if enabled) will be created.', - ) - }} - </label> - - <input name="service[commit_events]" type="hidden" :value="triggerCommit || false" /> - <gl-form-checkbox v-model="triggerCommit" :disabled="isInheriting"> - {{ __('Commit') }} - </gl-form-checkbox> - - <input - name="service[merge_requests_events]" - type="hidden" - :value="triggerMergeRequest || false" - /> - <gl-form-checkbox v-model="triggerMergeRequest" :disabled="isInheriting"> - {{ __('Merge request') }} - </gl-form-checkbox> - - <div - v-show="triggerCommit || triggerMergeRequest" - class="mt-4" - data-testid="comment-settings" - > - <label> - {{ s__('Integrations|Comment settings:') }} - </label> - <input - name="service[comment_on_event_enabled]" - type="hidden" - :value="enableComments || false" - /> - <gl-form-checkbox v-model="enableComments" :disabled="isInheriting"> - {{ s__('Integrations|Enable comments') }} - </gl-form-checkbox> - - <div v-show="enableComments" class="mt-4" data-testid="comment-detail"> - <label> - {{ s__('Integrations|Comment detail:') }} - </label> - <input - v-if="isInheriting" - name="service[comment_detail]" - type="hidden" - :value="commentDetail" - /> - <gl-form-radio - v-for="commentDetailOption in commentDetailOptions" - :key="commentDetailOption.value" - v-model="commentDetail" - :value="commentDetailOption.value" - :disabled="isInheriting" - > - {{ commentDetailOption.label }} - <template #help> - {{ commentDetailOption.help }} - </template> - </gl-form-radio> - </div> - </div> - </div> - </div> </template> |