Add latest changes from gitlab-org/gitlab@master

6 files changed, 28 insertions, 14 deletions

diff --git a/app/assets/javascripts/sidebar/components/assignees/collapsed_assignee_list.vue b/app/assets/javascripts/sidebar/components/assignees/collapsed_assignee_list.vue
index 577c01c50ff..8a912b00df1 100644
--- a/app/assets/javascripts/sidebar/components/assignees/collapsed_assignee_list.vue
+++ b/app/assets/javascripts/sidebar/components/assignees/collapsed_assignee_list.vue
@@ -84,7 +84,8 @@ export default {
 
       if (mergeLength === this.users.length) {
         return '';
-      } else if (mergeLength > 0) {
+      }
+      if (mergeLength > 0) {
         return sprintf(__('%{mergeLength}/%{usersLength} can merge'), {
           mergeLength,
           usersLength: this.users.length,
diff --git a/app/assets/javascripts/sidebar/components/labels/labels_select_vue/store/getters.js b/app/assets/javascripts/sidebar/components/labels/labels_select_vue/store/getters.js
index 03ace6286e0..3ab7757d34d 100644
--- a/app/assets/javascripts/sidebar/components/labels/labels_select_vue/store/getters.js
+++ b/app/assets/javascripts/sidebar/components/labels/labels_select_vue/store/getters.js
@@ -19,7 +19,8 @@ export const dropdownButtonText = (state, getters) => {
 
   if (!selectedLabels.length) {
     return state.dropdownButtonText || __('Label');
-  } else if (selectedLabels.length > 1) {
+  }
+  if (selectedLabels.length > 1) {
     return sprintf(s__('LabelSelect|%{firstLabelName} +%{remainingLabelCount} more'), {
       firstLabelName: selectedLabels[0].title,
       remainingLabelCount: selectedLabels.length - 1,
diff --git a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents.vue b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents.vue
index 53582aacabd..a513c247be7 100644
--- a/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents.vue
+++ b/app/assets/javascripts/sidebar/components/labels/labels_select_widget/dropdown_contents.vue
@@ -101,7 +101,8 @@ export default {
     buttonText() {
       if (!this.localSelectedLabels.length) {
         return this.dropdownButtonText || __('Label');
-      } else if (this.localSelectedLabels.length > 1) {
+      }
+      if (this.localSelectedLabels.length > 1) {
         return sprintf(s__('LabelSelect|%{firstLabelName} +%{remainingLabelCount} more'), {
           firstLabelName: this.localSelectedLabels[0].title,
           remainingLabelCount: this.localSelectedLabels.length - 1,
diff --git a/app/assets/javascripts/sidebar/components/reviewers/collapsed_reviewer_list.vue b/app/assets/javascripts/sidebar/components/reviewers/collapsed_reviewer_list.vue
index 88a74784dd2..415c40b4779 100644
--- a/app/assets/javascripts/sidebar/components/reviewers/collapsed_reviewer_list.vue
+++ b/app/assets/javascripts/sidebar/components/reviewers/collapsed_reviewer_list.vue
@@ -52,7 +52,8 @@ export default {
 
       if (mergeLength === this.users.length) {
         return '';
-      } else if (mergeLength > 0) {
+      }
+      if (mergeLength > 0) {
         return sprintf(__('%{mergeLength}/%{usersLength} can merge'), {
           mergeLength,
           usersLength: this.users.length,
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue b/app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue
index 465f971717f..ac05ae3896b 100644
--- a/app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue
+++ b/app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue
@@ -42,11 +42,14 @@ export default {
     divClass() {
       if (this.showComparisonState) {
         return 'compare';
-      } else if (this.showEstimateOnlyState) {
+      }
+      if (this.showEstimateOnlyState) {
         return 'estimate-only';
-      } else if (this.showSpentOnlyState) {
+      }
+      if (this.showSpentOnlyState) {
         return 'spend-only';
-      } else if (this.showNoTimeTrackingState) {
+      }
+      if (this.showNoTimeTrackingState) {
         return 'no-tracking';
       }
 
@@ -55,9 +58,11 @@ export default {
     spanClass() {
       if (this.showComparisonState) {
         return '';
-      } else if (this.showEstimateOnlyState || this.showSpentOnlyState) {
+      }
+      if (this.showEstimateOnlyState || this.showSpentOnlyState) {
         return 'bold';
-      } else if (this.showNoTimeTrackingState) {
+      }
+      if (this.showNoTimeTrackingState) {
         return 'no-value collapse-truncated-title gl-pt-2 gl-px-3 gl-font-sm';
       }
 
@@ -66,11 +71,14 @@ export default {
     text() {
       if (this.showComparisonState) {
         return `${this.timeSpentHumanReadable} / ${this.timeEstimateHumanReadable}`;
-      } else if (this.showEstimateOnlyState) {
+      }
+      if (this.showEstimateOnlyState) {
         return `-- / ${this.timeEstimateHumanReadable}`;
-      } else if (this.showSpentOnlyState) {
+      }
+      if (this.showSpentOnlyState) {
         return `${this.timeSpentHumanReadable} / --`;
-      } else if (this.showNoTimeTrackingState) {
+      }
+      if (this.showNoTimeTrackingState) {
         return __('None');
       }
 
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue b/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue
index 91b23689f0d..aff592d48e0 100644
--- a/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue
+++ b/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue
@@ -123,9 +123,11 @@ export default {
         // 3. issuableIid and fullPath are not provided
         if (!this.issuableType || !timeTrackingQueries[this.issuableType]) {
           return true;
-        } else if (this.initialTimeTracking) {
+        }
+        if (this.initialTimeTracking) {
           return true;
-        } else if (!this.issuableIid || !this.fullPath) {
+        }
+        if (!this.issuableIid || !this.fullPath) {
           return true;
         }
         return false;