Add latest changes from gitlab-org/gitlab@master

10 files changed, 63 insertions, 36 deletions

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/added_commit_message.vue b/app/assets/javascripts/vue_merge_request_widget/components/added_commit_message.vue
index 5090081d281..3b62345b969 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/added_commit_message.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/added_commit_message.vue
@@ -70,7 +70,8 @@ export default {
     message() {
       if (this.state === STATUS_CLOSED) {
         return s__('mrWidgetCommitsAdded|The changes were not merged into %{targetBranch}.');
-      } else if (this.isMerged) {
+      }
+      if (this.isMerged) {
         return s__(
           'mrWidgetCommitsAdded|Changes merged into %{targetBranch} with %{mergeCommitSha}%{squashedCommits}.',
         );
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue b/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue
index 95fa01c23f1..4ed470440cc 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue
@@ -131,7 +131,8 @@ export default {
           variant: 'confirm',
           action: () => this.approve(),
         };
-      } else if (this.showUnapprove) {
+      }
+      if (this.showUnapprove) {
         return {
           text: s__('mrWidget|Revoke approval'),
           variant: 'default',
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment/memory_usage.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment/memory_usage.vue
index c7d34d45f06..efe71ed569a 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/deployment/memory_usage.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment/memory_usage.vue
@@ -58,7 +58,8 @@ export default {
         return s__(
           'mrWidget|%{metricsLinkStart} Memory %{metricsLinkEnd} usage %{emphasisStart} increased %{emphasisEnd} from %{memoryFrom}MB to %{memoryTo}MB',
         );
-      } else if (memoryTo < memoryFrom) {
+      }
+      if (memoryTo < memoryFrom) {
         return s__(
           'mrWidget|%{metricsLinkStart} Memory %{metricsLinkEnd} usage %{emphasisStart} decreased %{emphasisEnd} from %{memoryFrom}MB to %{memoryTo}MB',
         );
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/extensions/utils.js b/app/assets/javascripts/vue_merge_request_widget/components/extensions/utils.js
index 757178ee336..83f5c1490e2 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/extensions/utils.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/extensions/utils.js
@@ -65,11 +65,8 @@ const createText = (text) => {
 export const generateText = (text) => {
   if (typeof text === 'string') {
     return createText(escapeText(text));
-  } else if (
-    typeof text === 'object' &&
-    typeof text.text === 'string' &&
-    typeof text.href === 'string'
-  ) {
+  }
+  if (typeof text === 'object' && typeof text.text === 'string' && typeof text.href === 'string') {
     return createText(
       `${
         text.prependText ? `${escapeText(text.prependText)} ` : ''
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/commits_header.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/commits_header.vue
index 400759aa086..4f39bd1d972 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/commits_header.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/commits_header.vue
@@ -38,7 +38,7 @@ export default {
     },
     modifyLinkMessage() {
       if (this.isFastForwardEnabled) return __('Modify commit message');
-      else if (this.isSquashEnabled) return __('Modify commit messages');
+      if (this.isSquashEnabled) return __('Modify commit messages');
       return __('Modify merge commit');
     },
     ariaLabel() {
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/merge_checks_failed.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/merge_checks_failed.vue
index 61eec503951..bf2c5e52184 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/merge_checks_failed.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/merge_checks_failed.vue
@@ -30,9 +30,11 @@ export default {
     failedText() {
       if (this.mr.approvals && !this.mr.isApproved) {
         return this.$options.i18n.approvalNeeded;
-      } else if (this.mr.detailedMergeStatus === DETAILED_MERGE_STATUS.BLOCKED_STATUS) {
+      }
+      if (this.mr.detailedMergeStatus === DETAILED_MERGE_STATUS.BLOCKED_STATUS) {
         return this.$options.i18n.blockingMergeRequests;
-      } else if (this.mr.detailedMergeStatus === DETAILED_MERGE_STATUS.EXTERNAL_STATUS_CHECKS) {
+      }
+      if (this.mr.detailedMergeStatus === DETAILED_MERGE_STATUS.EXTERNAL_STATUS_CHECKS) {
         return this.$options.i18n.externalStatusChecksFailed;
       }
 
diff --git a/app/assets/javascripts/vue_merge_request_widget/extensions/code_quality/index.js b/app/assets/javascripts/vue_merge_request_widget/extensions/code_quality/index.js
index 713c9e610b3..3af984dcf6c 100644
--- a/app/assets/javascripts/vue_merge_request_widget/extensions/code_quality/index.js
+++ b/app/assets/javascripts/vue_merge_request_widget/extensions/code_quality/index.js
@@ -23,14 +23,17 @@ export default {
       const { newErrors, resolvedErrors, parsingInProgress } = data;
       if (parsingInProgress) {
         return i18n.loading;
-      } else if (newErrors.length >= 1 && resolvedErrors.length >= 1) {
+      }
+      if (newErrors.length >= 1 && resolvedErrors.length >= 1) {
         return i18n.improvementAndDegradationCopy(
           i18n.findings(resolvedErrors, codeQualityPrefixes.fixed),
           i18n.findings(newErrors, codeQualityPrefixes.new),
         );
-      } else if (resolvedErrors.length >= 1) {
+      }
+      if (resolvedErrors.length >= 1) {
         return i18n.singularCopy(i18n.findings(resolvedErrors, codeQualityPrefixes.fixed));
-      } else if (newErrors.length >= 1) {
+      }
+      if (newErrors.length >= 1) {
         return i18n.singularCopy(i18n.findings(newErrors, codeQualityPrefixes.new));
       }
       return i18n.noChanges;
@@ -38,7 +41,8 @@ export default {
     statusIcon() {
       if (this.collapsedData.newErrors.length >= 1) {
         return EXTENSION_ICONS.warning;
-      } else if (this.collapsedData.resolvedErrors.length >= 1) {
+      }
+      if (this.collapsedData.resolvedErrors.length >= 1) {
         return EXTENSION_ICONS.success;
       }
       return EXTENSION_ICONS.neutral;
diff --git a/app/assets/javascripts/vue_merge_request_widget/extensions/code_quality/index.vue b/app/assets/javascripts/vue_merge_request_widget/extensions/code_quality/index.vue
index d30acf24684..cd3a98effa3 100644
--- a/app/assets/javascripts/vue_merge_request_widget/extensions/code_quality/index.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/extensions/code_quality/index.vue
@@ -36,9 +36,11 @@ export default {
 
       if (!this.pollingFinished) {
         return { title: i18n.loading };
-      } else if (this.hasError) {
+      }
+      if (this.hasError) {
         return { title: i18n.error };
-      } else if (
+      }
+      if (
         this.collapsedData?.new_errors?.length >= 1 &&
         this.collapsedData?.resolved_errors?.length >= 1
       ) {
@@ -48,11 +50,13 @@ export default {
             i18n.findings(new_errors, codeQualityPrefixes.new),
           ),
         };
-      } else if (this.collapsedData?.resolved_errors?.length >= 1) {
+      }
+      if (this.collapsedData?.resolved_errors?.length >= 1) {
         return {
           title: i18n.singularCopy(i18n.findings(resolved_errors, codeQualityPrefixes.fixed)),
         };
-      } else if (this.collapsedData?.new_errors?.length >= 1) {
+      }
+      if (this.collapsedData?.new_errors?.length >= 1) {
         return { title: i18n.singularCopy(i18n.findings(new_errors, codeQualityPrefixes.new)) };
       }
       return { title: i18n.noChanges };
@@ -95,7 +99,8 @@ export default {
     statusIcon() {
       if (this.collapsedData?.new_errors?.length >= 1) {
         return EXTENSION_ICONS.warning;
-      } else if (this.collapsedData?.resolved_errors?.length >= 1) {
+      }
+      if (this.collapsedData?.resolved_errors?.length >= 1) {
         return EXTENSION_ICONS.success;
       }
       return EXTENSION_ICONS.neutral;
diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js b/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js
index f90056a8e1a..d6bab074f3f 100644
--- a/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js
+++ b/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js
@@ -4,31 +4,44 @@ import { stateKey } from './state_maps';
 export default function deviseState() {
   if (this.detailedMergeStatus === DETAILED_MERGE_STATUS.PREPARING) {
     return stateKey.preparing;
-  } else if (!this.commitsCount) {
+  }
+  if (!this.commitsCount) {
     return stateKey.nothingToMerge;
-  } else if (this.projectArchived) {
+  }
+  if (this.projectArchived) {
     return stateKey.archived;
-  } else if (this.branchMissing) {
+  }
+  if (this.branchMissing) {
     return stateKey.missingBranch;
-  } else if (this.detailedMergeStatus === DETAILED_MERGE_STATUS.CHECKING) {
+  }
+  if (this.detailedMergeStatus === DETAILED_MERGE_STATUS.CHECKING) {
     return stateKey.checking;
-  } else if (this.hasConflicts) {
+  }
+  if (this.hasConflicts) {
     return stateKey.conflicts;
-  } else if (this.shouldBeRebased) {
+  }
+  if (this.shouldBeRebased) {
     return stateKey.rebase;
-  } else if (this.hasMergeChecksFailed && !this.autoMergeEnabled) {
+  }
+  if (this.hasMergeChecksFailed && !this.autoMergeEnabled) {
     return stateKey.mergeChecksFailed;
-  } else if (this.detailedMergeStatus === DETAILED_MERGE_STATUS.CI_MUST_PASS) {
+  }
+  if (this.detailedMergeStatus === DETAILED_MERGE_STATUS.CI_MUST_PASS) {
     return stateKey.pipelineFailed;
-  } else if (this.detailedMergeStatus === DETAILED_MERGE_STATUS.DRAFT_STATUS) {
+  }
+  if (this.detailedMergeStatus === DETAILED_MERGE_STATUS.DRAFT_STATUS) {
     return stateKey.draft;
-  } else if (this.detailedMergeStatus === DETAILED_MERGE_STATUS.DISCUSSIONS_NOT_RESOLVED) {
+  }
+  if (this.detailedMergeStatus === DETAILED_MERGE_STATUS.DISCUSSIONS_NOT_RESOLVED) {
     return stateKey.unresolvedDiscussions;
-  } else if (this.canMerge && this.isSHAMismatch) {
+  }
+  if (this.canMerge && this.isSHAMismatch) {
     return stateKey.shaMismatch;
-  } else if (this.autoMergeEnabled && !this.mergeError) {
+  }
+  if (this.autoMergeEnabled && !this.mergeError) {
     return stateKey.autoMergeEnabled;
-  } else if (
+  }
+  if (
     this.detailedMergeStatus === DETAILED_MERGE_STATUS.MERGEABLE ||
     this.detailedMergeStatus === DETAILED_MERGE_STATUS.CI_STILL_RUNNING
   ) {
diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
index a74b7ed8587..bb74f82145f 100644
--- a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
+++ b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
@@ -351,11 +351,14 @@ export default class MergeRequestStore {
 
     if (availableAutoMergeStrategies.includes(MTWPS_MERGE_STRATEGY)) {
       return MTWPS_MERGE_STRATEGY;
-    } else if (availableAutoMergeStrategies.includes(MT_MERGE_STRATEGY)) {
+    }
+    if (availableAutoMergeStrategies.includes(MT_MERGE_STRATEGY)) {
       return MT_MERGE_STRATEGY;
-    } else if (availableAutoMergeStrategies.includes(MWCP_MERGE_STRATEGY)) {
+    }
+    if (availableAutoMergeStrategies.includes(MWCP_MERGE_STRATEGY)) {
       return MWCP_MERGE_STRATEGY;
-    } else if (availableAutoMergeStrategies.includes(MWPS_MERGE_STRATEGY)) {
+    }
+    if (availableAutoMergeStrategies.includes(MWPS_MERGE_STRATEGY)) {
       return MWPS_MERGE_STRATEGY;
     }