Merge branch 'multiple-assignees-fe-sidebar' into multiple-assignees-issue-board-sidebar

app/assets/javascripts/sidebar/components/assignees/assignees.js

@@ -89,8 +89,10 @@ export default {
       return `@${user.username}`;
     },
     shouldRenderCollapsedAssignee(index) {
-      return index === 0 || this.users.length <= 2 && index <= 2
-    }
+      const firstTwo = this.users.length <= 2 && index <= 2;
+
+      return index === 0 || firstTwo;
+    },
   },
   template: `
     <div>

app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.js

@@ -49,6 +49,8 @@ export default {
       } else if (this.showNoTimeTrackingState) {
         return 'no-tracking';
       }
+
+      return '';
     },
     spanClass() {
       if (this.showComparisonState) {
@@ -58,6 +60,8 @@ export default {
       } else if (this.showNoTimeTrackingState) {
         return 'no-value';
       }
+
+      return '';
     },
     text() {
       if (this.showComparisonState) {
@@ -69,7 +73,9 @@ export default {
       } else if (this.showNoTimeTrackingState) {
         return 'None';
       }
-    }
+
+      return '';
+    },
   },
   methods: {
     abbreviateTime(timeStr) {

app/assets/javascripts/sidebar/sidebar_mediator.js

@@ -44,8 +44,6 @@ export default class SidebarMediator {
         this.store.processUserData(data);
         this.store.processTimeTrackingData(data);
       })
-      .catch(() => {
-        return new Flash('Error occured when fetching sidebar data');
-      });
+      .catch(() => new Flash('Error occured when fetching sidebar data'));
   }
 }

app/assets/javascripts/weight_select.js

@@ -55,7 +55,7 @@
             }
           },
           clicked: function(options) {
-            const { $el, e } = options;
+            const e = options.e;
             let selected = options.selectedObj;
 
             if ($(dropdown).is(".js-filter-submit")) {