diff options
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue index 39c56cbb93d..448805cf8b9 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue @@ -1,6 +1,5 @@ <script> import { s__ } from '~/locale'; -import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import eventHub from '../../event_hub'; import mergeRequestQueryVariablesMixin from '../../mixins/merge_request_query_variables'; import autoMergeFailedQuery from '../../queries/states/auto_merge_failed.query.graphql'; @@ -11,13 +10,10 @@ export default { components: { StateContainer, }, - mixins: [glFeatureFlagMixin(), mergeRequestQueryVariablesMixin], + mixins: [mergeRequestQueryVariablesMixin], apollo: { mergeError: { query: autoMergeFailedQuery, - skip() { - return !this.glFeatures.mergeRequestWidgetGraphql; - }, variables() { return this.mergeRequestQueryVariables; }, @@ -32,7 +28,7 @@ export default { }, data() { return { - mergeError: this.glFeatures.mergeRequestWidgetGraphql ? null : this.mr.mergeError, + mergeError: null, isRefreshing: false, }; }, |