Merge branch 'prettify-all-the-things-6' into 'master'

Prettify all the things (part 6)

See merge request gitlab-org/gitlab-ce!22256

1 files changed, 87 insertions, 93 deletions

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue
index c19b67f00fa..656c3b5c47e 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue
@@ -1,106 +1,100 @@
 <script>
-  import Flash from '~/flash';
-  import tooltip from '~/vue_shared/directives/tooltip';
-  import { s__, __ } from '~/locale';
-  import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
-  import MrWidgetAuthorTime from '../../components/mr_widget_author_time.vue';
-  import statusIcon from '../mr_widget_status_icon.vue';
-  import eventHub from '../../event_hub';
+import Flash from '~/flash';
+import tooltip from '~/vue_shared/directives/tooltip';
+import { s__, __ } from '~/locale';
+import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
+import MrWidgetAuthorTime from '../../components/mr_widget_author_time.vue';
+import statusIcon from '../mr_widget_status_icon.vue';
+import eventHub from '../../event_hub';
 
-  export default {
-    name: 'MRWidgetMerged',
-    directives: {
-      tooltip,
+export default {
+  name: 'MRWidgetMerged',
+  directives: {
+    tooltip,
+  },
+  components: {
+    MrWidgetAuthorTime,
+    statusIcon,
+    ClipboardButton,
+  },
+  props: {
+    mr: {
+      type: Object,
+      required: true,
+      default: () => ({}),
     },
-    components: {
-      MrWidgetAuthorTime,
-      statusIcon,
-      ClipboardButton,
+    service: {
+      type: Object,
+      required: true,
+      default: () => ({}),
     },
-    props: {
-      mr: {
-        type: Object,
-        required: true,
-        default: () => ({}),
-      },
-      service: {
-        type: Object,
-        required: true,
-        default: () => ({}),
-      },
+  },
+  data() {
+    return {
+      isMakingRequest: false,
+    };
+  },
+  computed: {
+    shouldShowRemoveSourceBranch() {
+      const { sourceBranchRemoved, isRemovingSourceBranch, canRemoveSourceBranch } = this.mr;
+
+      return (
+        !sourceBranchRemoved &&
+        canRemoveSourceBranch &&
+        !this.isMakingRequest &&
+        !isRemovingSourceBranch
+      );
     },
-    data() {
-      return {
-        isMakingRequest: false,
-      };
+    shouldShowSourceBranchRemoving() {
+      const { sourceBranchRemoved, isRemovingSourceBranch } = this.mr;
+      return !sourceBranchRemoved && (isRemovingSourceBranch || this.isMakingRequest);
     },
-    computed: {
-      shouldShowRemoveSourceBranch() {
-        const {
-          sourceBranchRemoved,
-          isRemovingSourceBranch,
-          canRemoveSourceBranch,
-        } = this.mr;
-
-        return !sourceBranchRemoved &&
-          canRemoveSourceBranch &&
-          !this.isMakingRequest &&
-          !isRemovingSourceBranch;
-      },
-      shouldShowSourceBranchRemoving() {
-        const {
-          sourceBranchRemoved,
-          isRemovingSourceBranch,
-        } = this.mr;
-        return !sourceBranchRemoved &&
-          (isRemovingSourceBranch || this.isMakingRequest);
-      },
-      shouldShowMergedButtons() {
-        const {
-          canRevertInCurrentMR,
-          canCherryPickInCurrentMR,
-          revertInForkPath,
-          cherryPickInForkPath,
-        } = this.mr;
+    shouldShowMergedButtons() {
+      const {
+        canRevertInCurrentMR,
+        canCherryPickInCurrentMR,
+        revertInForkPath,
+        cherryPickInForkPath,
+      } = this.mr;
 
-        return canRevertInCurrentMR ||
-          canCherryPickInCurrentMR ||
-          revertInForkPath ||
-          cherryPickInForkPath;
-      },
-      revertTitle() {
-        return s__('mrWidget|Revert this merge request in a new merge request');
-      },
-      cherryPickTitle() {
-        return s__('mrWidget|Cherry-pick this merge request in a new merge request');
-      },
-      revertLabel() {
-        return s__('mrWidget|Revert');
-      },
-      cherryPickLabel() {
-        return s__('mrWidget|Cherry-pick');
-      },
+      return (
+        canRevertInCurrentMR || canCherryPickInCurrentMR || revertInForkPath || cherryPickInForkPath
+      );
+    },
+    revertTitle() {
+      return s__('mrWidget|Revert this merge request in a new merge request');
+    },
+    cherryPickTitle() {
+      return s__('mrWidget|Cherry-pick this merge request in a new merge request');
+    },
+    revertLabel() {
+      return s__('mrWidget|Revert');
+    },
+    cherryPickLabel() {
+      return s__('mrWidget|Cherry-pick');
     },
-    methods: {
-      removeSourceBranch() {
-        this.isMakingRequest = true;
+  },
+  methods: {
+    removeSourceBranch() {
+      this.isMakingRequest = true;
 
-        this.service.removeSourceBranch()
-          .then(res => res.data)
-          .then((data) => {
-            if (data.message === 'Branch was removed') {
-              eventHub.$emit('MRWidgetUpdateRequested', () => {
-                this.isMakingRequest = false;
-              });
-            }
-          })
-          .catch(() => {
-            this.isMakingRequest = false;
-            Flash(__('Something went wrong. Please try again.'));
-          });
-      },
+      this.service
+        .removeSourceBranch()
+        .then(res => res.data)
+        .then(data => {
+          if (data.message === 'Branch was removed') {
+            eventHub.$emit('MRWidgetUpdateRequested', () => {
+              this.isMakingRequest = false;
+            });
+          }
+        })
+        .catch(() => {
+          this.isMakingRequest = false;
+          Flash(__('Something went wrong. Please try again.'));
+        });
     },
-  };
+  },
+};
 </script>
 <template>
   <div class="mr-widget-body media">