Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

CHANGELOG.md

@@ -10201,6 +10201,10 @@ No changes.
 - [Alias read_namespace to access_namespace and move usages to new ability](gitlab-org/gitlab@61cdb4127143162a9bf9182f9c3c2d8421ee447f) by @Taucher2003 ([merge request](gitlab-org/gitlab!126625))
 - [Remove `custom_roles_on_groups` feature flag](gitlab-org/gitlab@ddb4b4399b8bb82793410005c5778a002ae409b9) ([merge request](gitlab-org/gitlab!132187)) **GitLab Enterprise Edition**
 
+## 16.4.7 (2024-09-20)
+
+No changes.
+
 ## 16.4.6 (2024-07-23)
 
 ### Added (2 changes)
@@ -11031,6 +11035,10 @@ No changes.
 - [Convert design_user_mentions.note_id to bigint for self-managed](gitlab-org/gitlab@08219da99fc356fecc4e9965fe1891baca4d10ff) ([merge request](gitlab-org/gitlab!129111))
 - [Migrate etag cache store from SharedState to Cache](gitlab-org/gitlab@6476298fcdcf77206fa768bcca6bd1e3c7994936) ([merge request](gitlab-org/gitlab!129050))
 
+## 16.3.9 (2024-09-20)
+
+No changes.
+
 ## 16.3.8 (2024-07-23)
 
 ### Added (1 change)

app/assets/javascripts/ci/job_details/components/job_log_top_bar.vue

@@ -88,6 +88,9 @@ export default {
     };
   },
   computed: {
+    hasJobLogTimestampsEnabled() {
+      return this.jobLog.length > 0 && this.jobLog[0].time;
+    },
     jobLogSize() {
       return sprintf(s__('Job|Showing last %{size} of log.'), {
         size: numberToHumanSize(this.size),
@@ -186,29 +189,34 @@ export default {
 </script>
 <template>
   <div class="top-bar gl-flex gl-items-center gl-justify-between">
-    <!-- truncated log information -->
-    <div class="gl-hidden gl-truncate sm:gl-block" data-testid="showing-last">
-      <template v-if="isJobLogSizeVisible">
-        {{ jobLogSize }}
-        <gl-sprintf
-          v-if="rawPath && isComplete && logViewerPath"
-          :message="
-            s__(
-              'Job|%{rawLinkStart}View raw%{rawLinkEnd} or %{fullLinkStart}full log%{fullLinkEnd}.',
-            )
-          "
-        >
-          <template #rawLink="{ content }">
-            <gl-link :href="rawPath">{{ content }}</gl-link>
-          </template>
-          <template #fullLink="{ content }">
-            <gl-link :href="logViewerPath"> {{ content }}</gl-link>
-          </template>
-        </gl-sprintf>
-        <gl-link v-else-if="rawPath" :href="rawPath">{{ s__('Job|View raw') }}</gl-link>
-      </template>
+    <div class="gl-hidden gl-truncate sm:gl-block">
+      <!-- truncated log information -->
+      <span data-testid="showing-last">
+        <template v-if="isJobLogSizeVisible">
+          {{ jobLogSize }}
+          <gl-sprintf
+            v-if="rawPath && isComplete && logViewerPath"
+            :message="
+              s__(
+                'Job|%{rawLinkStart}View raw%{rawLinkEnd} or %{fullLinkStart}full log%{fullLinkEnd}.',
+              )
+            "
+          >
+            <template #rawLink="{ content }">
+              <gl-link :href="rawPath">{{ content }}</gl-link>
+            </template>
+            <template #fullLink="{ content }">
+              <gl-link :href="logViewerPath"> {{ content }}</gl-link>
+            </template>
+          </gl-sprintf>
+          <gl-link v-else-if="rawPath" :href="rawPath">{{ s__('Job|View raw') }}</gl-link>
+        </template>
+      </span>
+      <!-- eo truncated log information -->
+      <span v-if="hasJobLogTimestampsEnabled">
+        {{ s__('Job|Log timestamps in UTC.') }}
+      </span>
     </div>
-    <!-- eo truncated log information -->
 
     <div class="controllers">
       <slot name="controllers"> </slot>

app/assets/javascripts/ci/job_details/store/utils.js

@@ -22,13 +22,13 @@ const TIME_START = 11;
 const TIME_END = 19;
 /**
  * Shortens timestamps in the form "2024-05-22T12:43:46.962646Z"
- * and extracts the time from them, example: "12:43:46Z"
+ * and extracts the time from them, example: "12:43:46"
  *
  * If the timestamp appears malformed the full string is returned.
  */
 const extractTime = (timestamp) => {
   if (timestamp.length === TIMESTAMP_LENGTH) {
-    return `${timestamp.substring(TIME_START, TIME_END)}Z`;
+    return `${timestamp.substring(TIME_START, TIME_END)}`;
   }
   return timestamp;
 };

app/assets/javascripts/diffs/components/commit_item.vue

@@ -125,7 +125,7 @@ export default {
             :img-src="authorAvatar"
             :img-alt="authorName"
             :img-size="32"
-            class="avatar-cell gl-my-2 gl-mr-4 gl-hidden sm:gl-block"
+            class="avatar-cell gl-my-2 gl-mr-3 gl-hidden sm:gl-block"
           />
         </div>
         <div

app/assets/javascripts/packages_and_registries/shared/components/container_registry_metadata_database_alert.vue

@@ -35,7 +35,7 @@ export default {
     <gl-sprintf
       :message="
         s__(
-          'ContainerRegistry|The %{linkStart}next-generation container registry%{linkEnd} is now available for upgrade and testing on self-managed instances as a Beta feature. This upgraded registry supports online garbage collection, and has significant performance and reliability improvements.',
+          'ContainerRegistry|The %{linkStart}next-generation container registry%{linkEnd} is now available for upgrade on self-managed instances. This upgraded registry supports online garbage collection, and has significant performance and reliability improvements.',
         )
       "
     >

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

@@ -76,11 +76,11 @@ export default {
       :img-src="commit.author.avatarUrl"
       :img-alt="avatarLinkAltText"
       :img-size="32"
-      class="gl-my-2 gl-mr-4"
+      class="gl-my-2 gl-mr-3"
     />
     <user-avatar-image
       v-else
-      class="gl-my-2 gl-mr-4"
+      class="gl-my-2 gl-mr-3"
       :img-src="commit.authorGravatar || $options.defaultAvatarUrl"
       :size="32"
     />

app/assets/stylesheets/components/avatar.scss

@@ -4,9 +4,6 @@ $avatar-sizes: (
     line-height: 16px,
     border-radius: $border-radius-small
   ),
-  18: (
-    border-radius: $border-radius-small
-  ),
   20: (
     border-radius: $border-radius-small
   ),

app/controllers/profiles_controller.rb

@@ -11,7 +11,7 @@ class ProfilesController < Profiles::ApplicationController
   end
 
   feature_category :user_profile, [:reset_incoming_email_token, :reset_feed_token,
-    :reset_static_object_token, :update_username, :join_early_access_program]
+    :reset_static_object_token, :update_username]
 
   def reset_incoming_email_token
     Users::UpdateService.new(current_user, user: @user).execute! do |user|
@@ -116,4 +116,4 @@ def user_params
   end
 end
 
-ProfilesController.prepend_mod_with('ProfilesController')
+ProfilesController.prepend_mod

app/models/member.rb

@@ -58,6 +58,7 @@ class Member < ApplicationRecord
     },
     if: :project_bot?
   validate :access_level_inclusion
+  validate :user_is_not_placeholder
 
   scope :with_invited_user_state, -> do
     joins('LEFT JOIN users as invited_user ON invited_user.email = members.invite_email')
@@ -611,6 +612,14 @@ def access_level_inclusion
     errors.add(:access_level, "is not included in the list")
   end
 
+  def user_is_not_placeholder
+    if Gitlab::Import::PlaceholderUserCreator.placeholder_email_pattern.match?(invite_email)
+      errors.add(:invite_email, _('must not be a placeholder email'))
+    elsif user&.placeholder?
+      errors.add(:user_id, _("must not be a placeholder user"))
+    end
+  end
+
   def send_invite
     run_after_commit_or_now { Members::InviteMailer.initial_email(self, @raw_invite_token).deliver_later }
   end

app/views/projects/commits/_commit.html.haml

@@ -24,8 +24,8 @@
 - add_page_specific_style 'page_bundles/commit_description'
 
 %li{ class: ["commit flex-row", ("js-toggle-container" if collapsible)], id: "commit-#{commit.short_id}" }
-  .avatar-cell.gl-hidden.sm:gl-block
-    = author_avatar(commit, size: 40, has_tooltip: false)
+  .avatar-cell.gl-my-2
+    = author_avatar(commit, size: 32, has_tooltip: false, css_class: 'gl-inline-block')
 
   .commit-detail.flex-list.gl-flex.gl-justify-between.gl-items-center.gl-grow.gl-min-w-0
     .commit-content{ data: { testid: 'commit-content' } }
@@ -40,13 +40,13 @@
         = render Pajamas::ButtonComponent.new(icon: 'ellipsis_h',
           button_options: { class: 'button-ellipsis-horizontal text-expander js-toggle-button', data: { toggle: 'tooltip', container: 'body', collapse_title: toggle_commit_message, expand_title: toggle_commit_message }, title: toggle_commit_message, aria: { label: toggle_commit_message }})
 
-      .committer
+      .committer.gl-text-sm
         - commit_author_link = commit_author_link(commit, avatar: false, size: 24)
         - commit_authored_timeago = time_ago_with_tooltip(commit.authored_date, placement: 'bottom')
         - if commit.different_committer? && commit.committer
           - commit_committer_link = commit_committer_link(commit)
           - commit_committer_timeago = time_ago_with_tooltip(commit.committed_date, placement: 'bottom')
-          - commit_committer_avatar = commit_committer_avatar(commit.committer, size: 18, has_tooltip: false)
+          - commit_committer_avatar = commit_committer_avatar(commit.committer, size: 16, has_tooltip: false)
           - commit_text =  _('%{commit_author_link} authored %{commit_authored_timeago} and %{commit_committer_avatar} %{commit_committer_link} committed %{commit_committer_timeago}') % { commit_author_link: commit_author_link, commit_authored_timeago: commit_authored_timeago, commit_committer_avatar: commit_committer_avatar, commit_committer_link: commit_committer_link, commit_committer_timeago: commit_committer_timeago }
         - else
           - commit_text =  _('%{commit_author_link} authored %{commit_authored_timeago}') % { commit_author_link: commit_author_link, commit_authored_timeago: commit_authored_timeago }

app/views/projects/pages/_no_domains.html.haml

@@ -1,7 +1,7 @@
 - can_add_new_domain = can_create_pages_custom_domains?(current_user, @project)
 
 - if can?(current_user, :update_pages, @project)
-  = render ::Layouts::CrudComponent.new(s_('GitLabPages|Domains')) do |c|
+  = render ::Layouts::CrudComponent.new(s_('GitLabPages|Domains'), options: { class: 'gl-mt-5' }) do |c|
     - c.with_actions do
       - if can_add_new_domain
         = render Pajamas::ButtonComponent.new(variant: :confirm, href: new_project_pages_domain_path(@project)) do

app/views/projects/tags/index.html.haml

@@ -38,8 +38,7 @@
     = render 'shared/errors/gitaly_unavailable', reason: s_('TagsPage|Unable to load tags')
 
   - if show_empty_search
-    = render Pajamas::EmptyStateComponent.new(svg_path: 'illustrations/empty-state/empty-search-md.svg',
-      title: s_('TagsPage|Sorry, your filter produced no results'))
+    = render ::Layouts::EmptyResultComponent.new(type: :search)
   - else
     %ul.flex-list.content-list
       = render partial: 'tag', collection: @tags

config/routes/profile.rb

@@ -12,7 +12,6 @@
     put :reset_feed_token
     put :reset_static_object_token
     put :update_username
-    post :join_early_access_program
   end
 
   scope module: :profiles do

db/post_migrate/20240913004547_remove_placeholder_memberships.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class RemovePlaceholderMemberships < Gitlab::Database::Migration[2.2]
+  disable_ddl_transaction!
+
+  restrict_gitlab_migration gitlab_schema: :gitlab_main
+
+  milestone '17.5'
+
+  PLACEHOLDER_TYPE_ID = 15
+
+  def up
+    connection.execute(
+      <<~SQL
+        DELETE FROM members
+        WHERE members.id IN (
+          SELECT members.id
+          FROM members
+          INNER JOIN users
+          ON users.id = members.user_id
+          WHERE users.user_type = #{PLACEHOLDER_TYPE_ID}
+        );
+      SQL
+    )
+  end
+
+  def down
+    # no-op
+  end
+end

db/post_migrate/20240917153606_change_upcoming_reconciliations_organization_id_default.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class ChangeUpcomingReconciliationsOrganizationIdDefault < Gitlab::Database::Migration[2.2]
+  milestone '17.5'
+
+  DEFAULT_ORGANIZATION_ID = 1
+
+  def up
+    change_column_default('upcoming_reconciliations', 'organization_id', nil)
+  end
+
+  def down
+    change_column_default('upcoming_reconciliations', 'organization_id', DEFAULT_ORGANIZATION_ID)
+  end
+end

db/schema_migrations/20240913004547

@@ -0,0 +1 @@
+c78273a01b142fa9d24fdbd1d4b276054997a69a034b3a02c6a73c3aac9743ff

db/schema_migrations/20240917153606

@@ -0,0 +1 @@
+76481d2570ad6ecb9e6528b856d4724e0a375adf47fee84db1c17cf7273c227b

db/structure.sql

@@ -19204,7 +19204,7 @@ CREATE TABLE upcoming_reconciliations (
     display_alert_from date NOT NULL,
     created_at timestamp with time zone NOT NULL,
     updated_at timestamp with time zone NOT NULL,
-    organization_id bigint DEFAULT 1 NOT NULL
+    organization_id bigint NOT NULL
 );
 
 CREATE SEQUENCE upcoming_reconciliations_id_seq