Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.rubocop_todo/rspec/be_eq.yml

@@ -313,7 +313,6 @@ RSpec/BeEq:
     - 'ee/spec/requests/api/graphql/audit_events/streaming/http/namespace_filters/create_spec.rb'
     - 'ee/spec/requests/api/graphql/audit_events/streaming/instance_headers/create_spec.rb'
     - 'ee/spec/requests/api/graphql/boards/boards_query_spec.rb'
-    - 'ee/spec/requests/api/graphql/gitlab_subscriptions/namespaces/add_on_purchase_spec.rb'
     - 'ee/spec/requests/api/graphql/group/ci_cd_settings_spec.rb'
     - 'ee/spec/requests/api/graphql/group/dast_profile_schedule_spec.rb'
     - 'ee/spec/requests/api/graphql/group/flow_metrics_spec.rb'

app/assets/javascripts/content_editor/services/highlight_js_language_loader.js

@@ -92,6 +92,32 @@ export default {
   gcode: () => import(/* webpackChunkName: 'hl-gcode' */ 'highlight.js/lib/languages/gcode'),
   gherkin: () => import(/* webpackChunkName: 'hl-gherkin' */ 'highlight.js/lib/languages/gherkin'),
   gleam: () => import(/* webpackChunkName: 'hl-gleam' */ '@gleam-lang/highlight.js-gleam'),
+  glimmer: async () => [
+    [
+      'javascript',
+      await import(/* webpackChunkName: 'hl-javascript' */ 'highlight.js/lib/languages/javascript'),
+    ],
+    [
+      'glimmer',
+      {
+        default: (await import(/* webpackChunkName: 'hl-glimmer' */ 'highlightjs-glimmer')).glimmer,
+      },
+    ],
+  ],
+  'glimmer-javascript': async () => [
+    [
+      'javascript',
+      await import(/* webpackChunkName: 'hl-javascript' */ 'highlight.js/lib/languages/javascript'),
+    ],
+    [
+      'glimmer-javascript',
+      {
+        default: (
+          await import(/* webpackChunkName: 'hl-glimmer-javascript' */ 'highlightjs-glimmer')
+        ).glimmerJavascript,
+      },
+    ],
+  ],
   glsl: () => import(/* webpackChunkName: 'hl-glsl' */ 'highlight.js/lib/languages/glsl'),
   gml: () => import(/* webpackChunkName: 'hl-gml' */ 'highlight.js/lib/languages/gml'),
   go: () => import(/* webpackChunkName: 'hl-go' */ 'highlight.js/lib/languages/go'),

app/assets/javascripts/highlight_js/index.js

@@ -5,7 +5,13 @@ import { registerPlugins } from './plugins/index';
 
 const loadLanguage = async (language, hljs) => {
   const languageDefinition = await languageLoader[language]();
-  hljs.registerLanguage(language, languageDefinition.default);
+  if (Array.isArray(languageDefinition)) {
+    languageDefinition.forEach(([languageDependency, languageDependencyDefinition]) =>
+      hljs.registerLanguage(languageDependency, languageDependencyDefinition.default),
+    );
+  } else {
+    hljs.registerLanguage(language, languageDefinition.default);
+  }
 };
 
 const loadSubLanguages = async (languageDefinition, hljs) => {

app/assets/javascripts/repository/constants.js

@@ -102,3 +102,10 @@ export const CONFLICTS_MODAL_ID = 'fork-sync-conflicts-modal';
 
 export const FORK_UPDATED_EVENT = 'fork:updated';
 export const EVENT_FILE_SIZE_LIMIT_EXCEEDED = 'repository_file_size_limit_exceeded';
+
+export const FILE_EXTENSION_MAPPING_HLJS = {
+  '.gleam': 'gleam',
+  '.glimmer': 'glimmer',
+  '.gjs': 'glimmer-javascript',
+  '.gts': 'glimmer-javascript',
+};

app/assets/javascripts/repository/mixins/highlight_mixin.js

@@ -9,7 +9,7 @@ import { splitIntoChunks } from '~/vue_shared/components/source_viewer/workers/h
 import languageLoader from '~/content_editor/services/highlight_js_language_loader';
 import Tracking from '~/tracking';
 import axios from '~/lib/utils/axios_utils';
-import { TEXT_FILE_TYPE } from '../constants';
+import { TEXT_FILE_TYPE, FILE_EXTENSION_MAPPING_HLJS } from '../constants';
 
 /*
  * This mixin is intended to be used as an interface between our highlight worker and Vue components
@@ -50,8 +50,12 @@ export default {
       const { rawTextBlob, name, fileType, externalStorageUrl, rawPath, simpleViewer } = blob;
       let { language } = blob;
 
-      if (name.endsWith('.gleam')) {
-        language = 'gleam';
+      const fileExtensionOverride = Object.keys(FILE_EXTENSION_MAPPING_HLJS).find((extension) =>
+        name.endsWith(extension),
+      );
+
+      if (fileExtensionOverride) {
+        language = FILE_EXTENSION_MAPPING_HLJS[fileExtensionOverride];
       }
 
       if (simpleViewer?.fileType !== TEXT_FILE_TYPE) return;

app/assets/javascripts/vue_shared/components/source_viewer/constants.js

@@ -11,6 +11,8 @@ export const ROUGE_TO_HLJS_LANGUAGE_MAP = {
   docker: 'dockerfile',
   batchfile: 'dos',
   elixir: 'elixir',
+  glimmer: 'glimmer',
+  'glimmer-javascript': 'glimmer-javascript',
   html: 'xml',
   hylang: 'hy',
   tex: 'latex',

app/assets/javascripts/work_items/components/work_item_attributes_wrapper.vue

@@ -204,7 +204,7 @@ export default {
 </script>
 
 <template>
-  <div class="work-item-attributes-wrapper">
+  <div class="work-item-attributes-wrapper work-item-sidebar-container">
     <work-item-status
       v-if="showWorkItemStatus"
       class="work-item-attributes-item"

app/assets/javascripts/work_items/components/work_item_dates.vue

@@ -274,7 +274,7 @@ export default {
           />
         </gl-form-group>
         <gl-form-group
-          class="gl-m-0 gl-flex gl-items-center gl-gap-3"
+          class="gl-m-0 gl-flex gl-flex-wrap gl-items-center gl-gap-3"
           :label="s__('WorkItem|Due')"
           :label-for="$options.dueDateInputId"
           label-class="!gl-font-normal !gl-pb-0 gl-min-w-7 sm:gl-min-w-fit md:gl-min-w-7 gl-break-words"

app/assets/javascripts/work_items/components/work_item_time_tracking.vue

@@ -141,46 +141,58 @@ export default {
       />
     </div>
 
-    <div class="gl-flex gl-items-center gl-gap-2" data-testid="time-tracking-body">
+    <div
+      class="time-tracking-body gl-flex gl-flex-wrap gl-items-center gl-gap-2"
+      data-testid="time-tracking-body"
+    >
       <template v-if="totalTimeSpent || timeEstimate">
-        <span class="gl-text-subtle">{{ s__('TimeTracking|Spent') }}</span>
-        <gl-button
-          v-if="canUpdate"
-          v-gl-modal="timeTrackingModalId"
-          v-gl-tooltip="s__('TimeTracking|View time tracking report')"
-          variant="link"
-          data-testid="view-time-spent-button"
+        <div
+          class="time-tracking-spent-and-progress gl-flex gl-grow gl-flex-wrap-reverse gl-items-center gl-justify-between gl-gap-2"
         >
-          {{ humanTotalTimeSpent }}
-        </gl-button>
-        <template v-else>
-          {{ humanTotalTimeSpent }}
-        </template>
-        <template v-if="timeEstimate">
-          <gl-progress-bar
-            v-gl-tooltip="progressBarTooltipText"
-            class="gl-mx-2 gl-grow"
-            :value="timeRemainingPercent"
-            :variant="progressBarVariant"
-          />
-          <span class="gl-text-subtle">{{ s__('TimeTracking|Estimate') }}</span>
-          <gl-button
-            v-if="canUpdate"
-            v-gl-modal="setTimeEstimateModalId"
-            v-gl-tooltip="s__('TimeTracking|Set estimate')"
-            variant="link"
-            data-testid="set-estimate-button"
-          >
-            {{ humanTimeEstimate }}
-          </gl-button>
-          <template v-else>
-            {{ humanTimeEstimate }}
+          <div class="gl-flex gl-items-center gl-gap-2">
+            <span class="gl-text-subtle">{{ s__('TimeTracking|Spent') }}</span>
+            <gl-button
+              v-if="canUpdate"
+              v-gl-modal="timeTrackingModalId"
+              v-gl-tooltip="s__('TimeTracking|View time tracking report')"
+              variant="link"
+              data-testid="view-time-spent-button"
+            >
+              {{ humanTotalTimeSpent }}
+            </gl-button>
+            <template v-else>
+              {{ humanTotalTimeSpent }}
+            </template>
+          </div>
+          <template v-if="timeEstimate">
+            <gl-progress-bar
+              v-gl-tooltip="progressBarTooltipText"
+              class="time-tracking-progress gl-min-w-11 gl-grow"
+              :value="timeRemainingPercent"
+              :variant="progressBarVariant"
+            />
           </template>
+        </div>
+        <template v-if="timeEstimate">
+          <div class="gl-flex gl-items-center gl-gap-2">
+            <span class="gl-text-subtle">{{ s__('TimeTracking|Estimate') }}</span>
+            <gl-button
+              v-if="canUpdate"
+              v-gl-modal="setTimeEstimateModalId"
+              v-gl-tooltip="s__('TimeTracking|Set estimate')"
+              variant="link"
+              data-testid="set-estimate-button"
+            >
+              {{ humanTimeEstimate }}
+            </gl-button>
+            <template v-else>
+              {{ humanTimeEstimate }}
+            </template>
+          </div>
         </template>
         <gl-button
           v-else-if="canUpdate"
           v-gl-modal="setTimeEstimateModalId"
-          class="gl-ml-auto"
           variant="link"
           data-testid="add-estimate-button"
         >

app/assets/stylesheets/page_bundles/work_items.scss

@@ -54,7 +54,8 @@ $work-item-overview-gap-width: 2rem;
     // allow the main content area to shrink
     // grid items have "max-width: auto" so without the minmax the content can
     // spill outside of the overview container
-    grid-template-columns: minmax(0, 1fr) $work-item-overview-right-sidebar-width;
+    $work-item-sidebar-min-width: 13rem;
+    grid-template-columns: minmax(67%, 1fr) minmax($work-item-sidebar-min-width, $work-item-overview-right-sidebar-width);
     column-gap: $work-item-overview-gap-width;
   }
 }
@@ -364,8 +365,38 @@ $disclosure-hierarchy-chevron-dimension: 1.2rem;
   }
 }
 
-// Safari-specific override to avoid container stacking context problems
-@supports (-webkit-appearance:none) and (stroke-color:transparent) {
+.work-item-sidebar-container {
+  container-type: inline-size;
+  container-name: work-item-sidebar;
+
+  @container work-item-sidebar (max-width: #{calc($work-item-overview-right-sidebar-width - 3rem)}) {
+    .time-tracking-body {
+      @apply gl-flex-col gl-items-start;
+
+      .time-tracking-spent-and-progress {
+        @apply gl-flex-col-reverse gl-w-full gl-items-stretch;
+        
+        .time-tracking-progress {
+          @apply gl-mx-0 gl-my-2;
+        }
+      }
+    }
+
+    .work-item-date-input {
+      @apply gl-flex-col gl-items-stretch;
+
+      .work-item-datepicker {
+        @apply gl-max-w-full;
+      }
+    }
+  }
+}
+
+// Temporary fallback for browsers that do not properly support container queries.
+// Should be removed once container queries are fully stable across all browsers.
+// This is implemnted below for specific browsers.
+// Cf. https://gitlab.com/gitlab-org/gitlab/-/merge_requests/186598
+@mixin browser-specific-overrides {
   .work-item-design-widget-container {
     container-type: unset;
 
@@ -395,4 +426,18 @@ $disclosure-hierarchy-chevron-dimension: 1.2rem;
       }
     }
   }
-}
+  
+  .work-item-sidebar-container {
+    container-type: unset;
+  }
+}
+
+// Safari 
+@supports (-webkit-appearance:none) and (stroke-color:transparent) {
+  @include browser-specific-overrides;
+}
+
+// Firefox 
+@-moz-document url-prefix() {
+  @include browser-specific-overrides;
+}

app/controllers/admin/users_controller.rb

@@ -212,7 +212,7 @@ def disable_two_factor
 
   def create
     opts = user_params.merge(reset_password: true, skip_confirmation: true)
-    opts[:organization_id] ||= Current.organization&.id
+    opts[:organization_id] ||= Current.organization.id
 
     response = Users::CreateService.new(current_user, opts).execute
     @user = response.payload[:user]

app/controllers/omniauth_callbacks_controller.rb

@@ -229,7 +229,7 @@ def build_auth_user(auth_user_class)
 
   # Overridden in EE
   def build_auth_user_params
-    { organization_id: Current.organization&.id }
+    { organization_id: Current.organization.id }
   end
 
   # Overridden in EE

app/graphql/mutations/snippets/create.rb

@@ -85,7 +85,7 @@ def process_args_for_params!(args)
         # We need to rename `uploaded_files` into `files` because
         # it's the expected key param
         args[:files] = args.delete(:uploaded_files)
-        args[:organization_id] = Current.organization&.id
+        args[:organization_id] = Current.organization.id
         # Return nil to make it explicit that this method is mutating the args parameter, and that
         # the return value is not relevant and is not to be used.
         nil

app/graphql/resolvers/topics_resolver.rb

@@ -17,7 +17,7 @@ class TopicsResolver < BaseResolver
       description: 'Global ID of the organization.'
 
     def resolve(**args)
-      organization = authorized_find!(id: args[:organization_id] || ::Current.organization&.id)
+      organization = authorized_find!(id: args[:organization_id] || ::Current.organization.id)
 
       return organization_topics(organization.id) unless args[:search].present?
 

app/models/application_setting.rb

@@ -441,6 +441,10 @@ def self.kroki_formats_attributes
 
   validates :allowed_key_types, presence: true
 
+  validates :deletion_adjourned_period,
+    presence: true,
+    numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: 90 }
+
   validates_each :restricted_visibility_levels do |record, attr, value|
     value&.each do |level|
       unless Gitlab::VisibilityLevel.options.value?(level)

app/models/application_setting_implementation.rb

@@ -31,6 +31,7 @@ module ApplicationSettingImplementation
   ].freeze
 
   DEFAULT_MINIMUM_PASSWORD_LENGTH = 8
+  DEFAULT_NUMBER_OF_DAYS_BEFORE_REMOVAL = 7
 
   class_methods do
     def defaults # rubocop:disable Metrics/AbcSize
@@ -70,6 +71,7 @@ def defaults # rubocop:disable Metrics/AbcSize
         default_projects_limit: Settings.gitlab['default_projects_limit'],
         default_snippet_visibility: Settings.gitlab.default_projects_features['visibility_level'],
         default_syntax_highlighting_theme: 1,
+        deletion_adjourned_period: DEFAULT_NUMBER_OF_DAYS_BEFORE_REMOVAL,
         deny_all_requests_except_allowed: false,
         diff_max_patch_bytes: Gitlab::Git::Diff::DEFAULT_MAX_PATCH_BYTES,
         diff_max_files: Commit::DEFAULT_MAX_DIFF_FILES_SETTING,

app/models/namespace_setting.rb

@@ -5,6 +5,9 @@ class NamespaceSetting < ApplicationRecord
   include Sanitizable
   include ChronicDurationAttribute
   include EachBatch
+  include SafelyChangeColumnDefault
+
+  columns_changing_default :require_dpop_for_manage_api_endpoints
 
   ignore_column :token_expiry_notify_inherited, remove_with: '17.9', remove_after: '2025-01-11'
   enum pipeline_variables_default_role: ProjectCiCdSetting::PIPELINE_VARIABLES_OVERRIDE_ROLES, _prefix: true

app/views/groups/settings/_permissions.html.haml

@@ -40,7 +40,6 @@
     = render_if_exists 'groups/settings/service_access_tokens_expiration_enforced', f: f, group: @group
     = render_if_exists 'groups/settings/enforce_ssh_certificates', f: f, group: @group
     = render_if_exists 'groups/settings/extended_grat_expiry_webhook_execute', f: f, group: @group
-    = render_if_exists 'groups/settings/require_dpop_for_manage_api_endpoints', f: f, group: @group
     = render 'groups/settings/two_factor_auth', f: f, group: @group
     = render_if_exists 'groups/personal_access_token_expiration_policy', f: f, group: @group
     = render 'groups/settings/membership', f: f, group: @group

db/docs/batched_background_migrations/enable_restrict_user_defined_variables.yml

@@ -5,4 +5,4 @@ feature_category: ci_variables
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/181856
 milestone: '17.10'
 queued_migration_version: 20250220113009
-finalized_by: # version of the migration that finalized this BBM
+finalized_by: 20250429133944

db/migrate/20250415084005_add_ldap_column_to_user_member_role.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddLdapColumnToUserMemberRole < Gitlab::Database::Migration[2.2]
+  milestone '18.0'
+
+  def change
+    add_column :user_member_roles, :ldap, :boolean, null: false, default: false, if_not_exists: true
+  end
+end

db/post_migrate/20250415021808_change_namespace_settings_default.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class ChangeNamespaceSettingsDefault < Gitlab::Database::Migration[2.2]
+  milestone '18.0'
+
+  TABLE_NAME = :namespace_settings
+  COLUMN_NAME = :require_dpop_for_manage_api_endpoints
+
+  def change
+    change_column_default(TABLE_NAME, COLUMN_NAME, from: true, to: false)
+  end
+end