Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/ci/reports.gitlab-ci.yml

@@ -143,15 +143,23 @@ pajamas_adoption:
   extends:
     - .default-retry
     - .reports:rules:pajamas_adoption
-  allow_failure: true
+  allow_failure:
+    # The scanner exits with status:
+    # - 0 when no errors occur, and no blocking findings are found;
+    # - 1 when unexpected errors occur;
+    # - 2 when blocking findings are found.
+    # We only want to block the merge request in this last case.
+    exit_codes: 1
   image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/frontend/pajamas-adoption-scanner:latest
   stage: lint
   needs: []
+  variables:
+    FF_USE_NEW_BASH_EVAL_STRATEGY: 'true'
   script:
-    - EE_APP=$(test -d ee/app/ && echo 'ee/app/' || true)
-    - scan_gitlab_code_quality app/ $EE_APP
+    - scan_gitlab_code_quality {,ee/}app/
   artifacts:
     name: pajamas-adoption
+    when: always
     paths:
       - gl-code-quality-report.json
       - pas-findings.json

.gitlab/ci/rules.gitlab-ci.yml

@@ -2727,7 +2727,8 @@
     - <<: *if-merge-request
       changes:
         - '{,ee/}app/**/*.{js,vue,rb,haml}'
-    - <<: *if-default-refs
+    - <<: *if-default-branch-refs
+      allow_failure: true
 
 ################
 # Review rules #

.rubocop_todo/layout/empty_line_after_magic_comment.yml

@@ -126,7 +126,6 @@ Layout/EmptyLineAfterMagicComment:
     - 'config/routes/merge_requests.rb'
     - 'danger/ce_ee_vue_templates/Dangerfile'
     - 'danger/feature_flag/Dangerfile'
-    - 'danger/pajamas/Dangerfile'
     - 'ee/app/controllers/concerns/epics_actions.rb'
     - 'ee/app/controllers/concerns/saml_authorization.rb'
     - 'ee/app/controllers/ee/projects/analytics/cycle_analytics/stages_controller.rb'

.rubocop_todo/layout/line_length.yml

@@ -668,7 +668,6 @@ Layout/LineLength:
     - 'danger/ci_config/Dangerfile'
     - 'danger/documentation/Dangerfile'
     - 'danger/feature_flag/Dangerfile'
-    - 'danger/pajamas/Dangerfile'
     - 'danger/roulette/Dangerfile'
     - 'danger/vue_shared_documentation/Dangerfile'
     - 'ee/app/controllers/admin/elasticsearch_controller.rb'

.rubocop_todo/lint/missing_cop_enable_directive.yml

@@ -59,7 +59,6 @@ Lint/MissingCopEnableDirective:
     - 'app/services/projects/container_repository/third_party/delete_tags_service.rb'
     - 'app/services/search/global_service.rb'
     - 'danger/feature_flag/Dangerfile'
-    - 'danger/pajamas/Dangerfile'
     - 'ee/app/controllers/ee/admin/dashboard_controller.rb'
     - 'ee/app/controllers/ee/admin/groups_controller.rb'
     - 'ee/app/controllers/ee/admin/users_controller.rb'

app/assets/javascripts/emoji/components/picker.vue

@@ -145,7 +145,7 @@ export default {
         <gl-button
           v-gl-tooltip
           :title="$options.i18n.addReaction"
-          :class="toggleClass"
+          :class="[toggleClass, { 'is-active': isVisible }]"
           class="gl-relative gl-h-full"
           data-testid="add-reaction-button"
         >
@@ -154,10 +154,16 @@ export default {
               <gl-icon class="award-control-icon-neutral gl-button-icon" name="slight-smile" />
             </span>
             <span class="reaction-control-icon reaction-control-icon-positive">
-              <gl-icon class="award-control-icon-positive gl-button-icon" name="smiley" />
+              <gl-icon
+                class="award-control-icon-positive gl-button-icon gl-left-3!"
+                name="smiley"
+              />
             </span>
             <span class="reaction-control-icon reaction-control-icon-super-positive">
-              <gl-icon class="award-control-icon-super-positive gl-button-icon" name="smile" />
+              <gl-icon
+                class="award-control-icon-super-positive gl-button-icon gl-left-3!"
+                name="smile"
+              />
             </span>
           </slot>
         </gl-button>

app/assets/javascripts/packages_and_registries/settings/project/components/packages_protection_rules.vue

@@ -135,6 +135,8 @@ export default {
             :fields="$options.fields"
             show-empty
             stacked="md"
+            class="mb-3"
+            :aria-label="$options.i18n.settingBlockTitle"
             :busy="isLoadingPackageProtectionRules"
           >
             <template #table-busy>

app/assets/javascripts/repository/components/commit_info.vue

@@ -112,21 +112,21 @@ export default {
         </div>
         <div
           class="committer gl-flex-basis-full"
-          :class="truncateAuthorName ? 'gl-display-inline-flex' : ''"
+          :class="{ 'gl-display-inline-flex': truncateAuthorName }"
           data-testid="committer"
         >
           <gl-link
             v-if="commit.author"
             :href="commit.author.webPath"
             class="commit-author-link js-user-link"
-            :class="truncateAuthorName ? 'gl-display-inline-block gl-text-truncate' : ''"
+            :class="{ 'gl-display-inline-block gl-text-truncate': truncateAuthorName }"
           >
             {{ commit.author.name }}</gl-link
           >
           <template v-else>
             {{ commit.authorName }}
           </template>
-          {{ $options.i18n.authored }}&nbsp;
+          {{ $options.i18n.authored }}
           <timeago-tooltip :time="commit.authoredDate" tooltip-placement="bottom" />
         </div>
         <pre

app/assets/stylesheets/framework/files.scss

@@ -413,6 +413,7 @@ span.idiff {
 }
 
 .version-link {
+  display: inline-block;
   align-self: center;
   margin-top: $gl-spacing-scale-2;
   width: $gl-spacing-scale-5;

app/assets/stylesheets/pages/commits.scss

@@ -137,8 +137,12 @@
       color: $gl-text-color;
     }
 
+    &.gl-display-inline-flex {
+      gap: 0.5ch;
+    }
+
     .commit-author-link.gl-text-truncate {
-      max-width: 20ch;
+      max-width: 19ch;
     }
   }
 }