diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-28 15:10:37 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-28 15:10:37 +0300 |
| commit | f0c0458b3c73fb72de899ae4d6e9b2d47872decd (patch) | |
| tree | b70a2c339a0c6c5d37103b014acaf7b0fadc7591 /app/assets/javascripts/incidents_settings | |
| parent | c4b69460e8dd4921eb20fa78b47ceff294d725dc (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/incidents_settings')
| -rw-r--r-- | app/assets/javascripts/incidents_settings/components/alerts_form.vue | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/assets/javascripts/incidents_settings/components/alerts_form.vue b/app/assets/javascripts/incidents_settings/components/alerts_form.vue index 636d9fc4b90..85a8241789d 100644 --- a/app/assets/javascripts/incidents_settings/components/alerts_form.vue +++ b/app/assets/javascripts/incidents_settings/components/alerts_form.vue @@ -9,7 +9,6 @@ import { GlNewDropdown, GlNewDropdownItem, } from '@gitlab/ui'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { I18N_ALERT_SETTINGS_FORM, NO_ISSUE_TEMPLATE_SELECTED, @@ -28,7 +27,6 @@ export default { GlNewDropdown, GlNewDropdownItem, }, - mixins: [glFeatureFlagsMixin()], inject: ['service', 'alertSettings'], data() { return { @@ -127,7 +125,7 @@ export default { <span>{{ $options.i18n.sendEmail.label }}</span> </gl-form-checkbox> </gl-form-group> - <gl-form-group v-if="glFeatures.autoCloseIncident" class="gl-pl-0 gl-mb-5"> + <gl-form-group class="gl-pl-0 gl-mb-5"> <gl-form-checkbox v-model="autoCloseIncident"> <span>{{ $options.i18n.autoCloseIncidents.label }}</span> </gl-form-checkbox> |