Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.eslintrc.yml

@@ -33,10 +33,6 @@ rules:
         # consider. See
         # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89831.
         - '^(ee|jh)_component/'
-  # Disabled for now, to make the airbnb-base 12.1.0 -> 13.1.0 update smoother
-  no-else-return:
-    - error
-    - allowElseIf: true
   lines-between-class-members: off
   # all offenses of no-jquery/no-animate-toggle are false positives ( $toast.show() )
   no-jquery/no-animate-toggle: off

.gitignore

@@ -46,6 +46,7 @@ eslint-report.html
 /config/unicorn.rb
 /config/puma.rb
 /config/secrets.yml
+/config/session_store.yml
 /config/sidekiq.yml
 /config/click_house.yml
 /config/registry.key

.rubocop_todo/layout/line_length.yml

@@ -689,7 +689,6 @@ Layout/LineLength:
     - 'config/initializers/kaminari_active_record_relation_methods_with_limit.rb'
     - 'config/initializers/pages_storage_check.rb'
     - 'config/initializers/rails_host_authorization.rb'
-    - 'config/initializers/session_store.rb'
     - 'config/initializers/validate_database_config.rb'
     - 'config/initializers/validate_puma.rb'
     - 'config/initializers/zz_metrics.rb'

app/assets/javascripts/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue

@@ -267,7 +267,8 @@ export default {
             });
           }
         });
-      } else if (this.uniqueCommits.length > 0) {
+      }
+      if (this.uniqueCommits.length > 0) {
         return this.createContextCommits({ commits: this.uniqueCommits, forceReload: true });
       }
 

app/assets/javascripts/admin/abuse_report/components/labels_select.vue

@@ -74,7 +74,8 @@ export default {
     selectText() {
       if (!this.selected.length) {
         return this.$options.i18n.labelsListTitle;
-      } else if (this.selected.length > 1) {
+      }
+      if (this.selected.length > 1) {
         return sprintf(s__('LabelSelect|%{firstLabelName} +%{remainingLabelCount} more'), {
           firstLabelName: this.selected[0].title,
           remainingLabelCount: this.selected.length - 1,

app/assets/javascripts/admin/broadcast_messages/components/message_form.vue

@@ -234,7 +234,8 @@ export default {
     initialTarget() {
       if (this.targetAccessLevels.length > 0) {
         return TARGET_ROLES;
-      } else if (this.targetPath !== '') {
+      }
+      if (this.targetPath !== '') {
         return TARGET_ALL_MATCHING_PATH;
       }
       return TARGET_ALL;

app/assets/javascripts/analytics/cycle_analytics/components/formatted_stage_count.vue

@@ -13,7 +13,8 @@ export default {
     formattedStageCount() {
       if (!this.stageCount) {
         return '-';
-      } else if (this.stageCount > 1000) {
+      }
+      if (this.stageCount > 1000) {
         return sprintf(s__('ValueStreamAnalytics|%{stageCount}+ items'), {
           stageCount: formatNumber(1000),
         });

app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue

@@ -69,7 +69,8 @@ export default {
     selectedProjectsLabel() {
       if (this.selectedProjects.length === 1) {
         return this.selectedProjects[0].name;
-      } else if (this.selectedProjects.length > 1) {
+      }
+      if (this.selectedProjects.length > 1) {
         return n__(
           'CycleAnalytics|Project selected',
           'CycleAnalytics|%d projects selected',

app/assets/javascripts/authentication/webauthn/error.js

@@ -14,11 +14,14 @@ export default class WebAuthnError {
   message() {
     if (this.errorName === 'NotSupportedError') {
       return __('Your device is not compatible with GitLab. Please try another device');
-    } else if (this.errorName === 'InvalidStateError' && this.flowType === WEBAUTHN_AUTHENTICATE) {
+    }
+    if (this.errorName === 'InvalidStateError' && this.flowType === WEBAUTHN_AUTHENTICATE) {
       return __('This device has not been registered with us.');
-    } else if (this.errorName === 'InvalidStateError' && this.flowType === WEBAUTHN_REGISTER) {
+    }
+    if (this.errorName === 'InvalidStateError' && this.flowType === WEBAUTHN_REGISTER) {
       return __('This device has already been registered with us.');
-    } else if (this.errorName === 'SecurityError' && this.httpsDisabled) {
+    }
+    if (this.errorName === 'SecurityError' && this.httpsDisabled) {
       return __(
         'WebAuthn only works with HTTPS-enabled websites. Contact your administrator for more details.',
       );

app/assets/javascripts/behaviors/markdown/nodes/task_list_item.js

@@ -20,7 +20,8 @@ export default () => ({
           const checkbox = el.querySelector('input[type=checkbox].task-list-item-checkbox');
           if (checkbox?.matches('[data-inapplicable]')) {
             return { state: 'inapplicable' };
-          } else if (checkbox?.checked) {
+          }
+          if (checkbox?.checked) {
             return { state: 'done' };
           }