Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 14 deletions

diff --git a/app/assets/javascripts/integrations/edit/components/reset_confirmation_modal.vue b/app/assets/javascripts/integrations/edit/components/reset_confirmation_modal.vue
index 403bad3db11..41cd650f932 100644
--- a/app/assets/javascripts/integrations/edit/components/reset_confirmation_modal.vue
+++ b/app/assets/javascripts/integrations/edit/components/reset_confirmation_modal.vue
@@ -7,18 +7,12 @@ export default {
   components: {
     GlModal,
   },
-  computed: {
-    primaryProps() {
-      return {
-        text: __('Reset'),
-        attributes: [{ variant: 'danger' }, { category: 'primary' }],
-      };
-    },
-    cancelProps() {
-      return {
-        text: __('Cancel'),
-      };
-    },
+  primaryProps: {
+    text: __('Reset'),
+    attributes: [{ variant: 'danger' }, { category: 'primary' }],
+  },
+  cancelProps: {
+    text: __('Cancel'),
   },
   methods: {
     onReset() {
@@ -33,8 +27,8 @@ export default {
     modal-id="confirmResetIntegration"
     size="sm"
     :title="s__('Integrations|Reset integration?')"
-    :action-primary="primaryProps"
-    :action-cancel="cancelProps"
+    :action-primary="$options.primaryProps"
+    :action-cancel="$options.cancelProps"
     @primary="onReset"
   >
     <p>