Merge branch 'sh-cleanup-mwps-refresh' into 'master'

Clean up refresh fix for cancel automatic merge

See merge request gitlab-org/gitlab!29844

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue

@@ -52,7 +52,6 @@ export default {
         .then(res => res.data)
         .then(data => {
           eventHub.$emit('UpdateWidgetData', data);
-          eventHub.$emit('MRWidgetUpdateRequested');
         })
         .catch(() => {
           this.isCancellingAutoMerge = false;

app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js

@@ -123,15 +123,13 @@ export default class MergeRequestStore {
 
     const currentUser = data.current_user;
 
-    if (currentUser) {
-      this.cherryPickInForkPath = currentUser.cherry_pick_in_fork_path;
-      this.revertInForkPath = currentUser.revert_in_fork_path;
-
-      this.canRemoveSourceBranch = currentUser.can_remove_source_branch || false;
-      this.canCreateIssue = currentUser.can_create_issue || false;
-      this.canCherryPickInCurrentMR = currentUser.can_cherry_pick_on_current_merge_request || false;
-      this.canRevertInCurrentMR = currentUser.can_revert_on_current_merge_request || false;
-    }
+    this.cherryPickInForkPath = currentUser.cherry_pick_in_fork_path;
+    this.revertInForkPath = currentUser.revert_in_fork_path;
+
+    this.canRemoveSourceBranch = currentUser.can_remove_source_branch || false;
+    this.canCreateIssue = currentUser.can_create_issue || false;
+    this.canCherryPickInCurrentMR = currentUser.can_cherry_pick_on_current_merge_request || false;
+    this.canRevertInCurrentMR = currentUser.can_revert_on_current_merge_request || false;
 
     this.setState(data);
   }

changelogs/unreleased/sh-cleanup-mwps-refresh.yml

+---
+title: Clean up refresh fix for cancel automatic merge
+merge_request: 29844
+author:
+type: other