Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

app/assets/javascripts/behaviors/markdown/render_math.js

@@ -90,7 +90,7 @@ class SafeMathRenderer {
 
       const html = `
           <div class="alert gl-alert gl-alert-warning alert-dismissible lazy-render-math-container js-lazy-render-math-container fade show" role="alert">
-            ${spriteIcon('warning', 'text-warning-600 s16 gl-alert-icon')}
+            ${spriteIcon('warning', 'gl-text-orange-600 s16 gl-alert-icon')}
             <div class="display-flex gl-alert-content">
               <div>${message}</div>
               <div class="gl-alert-actions">

app/assets/javascripts/boards/components/issue_due_date.vue

@@ -102,7 +102,7 @@ export default {
     <gl-tooltip :target="() => $refs.issueDueDate" :placement="tooltipPlacement">
       <span class="bold">{{ __('Due date') }}</span>
       <br />
-      <span :class="{ 'text-danger-muted': isPastDue }">{{ title }}</span>
+      <span :class="{ 'gl-text-red-300': isPastDue }">{{ title }}</span>
     </gl-tooltip>
   </span>
 </template>

app/assets/javascripts/ci/reports/codequality_report/constants.js

@@ -1,10 +1,10 @@
 export const SEVERITY_CLASSES = {
-  info: 'text-primary-400',
-  minor: 'text-warning-200',
-  major: 'text-warning-400',
-  critical: 'text-danger-600',
-  blocker: 'text-danger-800',
-  unknown: 'text-secondary-400',
+  info: 'gl-text-blue-400',
+  minor: 'gl-text-orange-200',
+  major: 'gl-text-orange-400',
+  critical: 'gl-text-red-600',
+  blocker: 'gl-text-red-800',
+  unknown: 'gl-text-gray-400',
 };
 
 export const SEVERITY_ICONS = {

app/assets/javascripts/clusters/agents/constants.js

@@ -22,7 +22,7 @@ export const EVENT_DETAILS = {
     body: s__('ClusterAgents|Agent %{strongStart}connected%{strongEnd}'),
     titleIcon: {
       name: 'status-success',
-      class: 'text-success-500',
+      class: 'gl-text-green-500',
     },
   },
   agent_disconnected: {
@@ -31,7 +31,7 @@ export const EVENT_DETAILS = {
     body: s__('ClusterAgents|Agent %{strongStart}disconnected%{strongEnd}'),
     titleIcon: {
       name: 'severity-critical',
-      class: 'text-danger-800',
+      class: 'gl-text-red-800',
     },
   },
 };
@@ -50,12 +50,12 @@ export const REVOKE_TOKEN_MODAL_ID = 'revoke-token-%{tokenName}';
 
 export const INTEGRATION_STATUS_VALID_TOKEN = {
   icon: 'status-success',
-  iconClass: 'text-success-500',
+  iconClass: 'gl-text-green-500',
   text: s__('ClusterAgents|Valid access token'),
 };
 export const INTEGRATION_STATUS_NO_TOKEN = {
   icon: 'status-alert',
-  iconClass: 'text-danger-500',
+  iconClass: 'gl-text-red-500',
   text: s__('ClusterAgents|No agent access token'),
 };
 

app/assets/javascripts/clusters_list/constants.js

@@ -144,15 +144,15 @@ export const AGENT_STATUSES = {
   active: {
     name: s__('ClusterAgents|Connected'),
     icon: 'status-success',
-    class: 'text-success-500',
+    class: 'gl-text-green-500',
     tooltip: {
       title: sprintf(s__('ClusterAgents|Last connected %{timeAgo}.')),
     },
   },
   inactive: {
     name: s__('ClusterAgents|Not connected'),
     icon: 'status-alert',
-    class: 'text-danger-500',
+    class: 'gl-text-red-500',
     tooltip: {
       title: s__('ClusterAgents|Agent might not be connected to GitLab'),
       body: sprintf(
@@ -165,7 +165,7 @@ export const AGENT_STATUSES = {
   unused: {
     name: s__('ClusterAgents|Never connected'),
     icon: 'status-neutral',
-    class: 'text-secondary-500',
+    class: 'gl-text-gray-500',
     tooltip: {
       title: s__('ClusterAgents|Agent never connected to GitLab'),
       body: s__('ClusterAgents|Make sure you are using a valid token.'),

app/assets/javascripts/design_management/components/list/item.vue

@@ -64,17 +64,17 @@ export default {
       const icons = {
         creation: {
           name: 'file-addition-solid',
-          classes: 'text-success-500',
+          classes: 'gl-text-green-500',
           tooltip: __('Added in this version'),
         },
         modification: {
           name: 'file-modified-solid',
-          classes: 'text-primary-500',
+          classes: 'gl-text-blue-500',
           tooltip: __('Modified in this version'),
         },
         deletion: {
           name: 'file-deletion-solid',
-          classes: 'text-danger-500',
+          classes: 'gl-text-red-500',
           tooltip: __('Archived in this version'),
         },
       };

app/assets/javascripts/issuable/components/issue_milestone.vue

@@ -82,7 +82,7 @@ export default {
       <span
         v-if="milestoneStart || milestoneDue"
         :class="{
-          'text-danger-muted': isMilestonePastDue,
+          'gl-text-red-300': isMilestonePastDue,
           'text-tertiary': !isMilestonePastDue,
         }"
         ><span>{{ milestoneDatesHuman }}</span

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

@@ -1,8 +1,8 @@
 export const SEVERITY_CLASS_NAME_MAP = {
-  critical: 'text-danger-800',
-  high: 'text-danger-600',
-  medium: 'text-warning-400',
-  low: 'text-warning-200',
-  info: 'text-primary-400',
-  unknown: 'text-secondary-400',
+  critical: 'gl-text-red-800',
+  high: 'gl-text-red-600',
+  medium: 'gl-text-orange-400',
+  low: 'gl-text-orange-200',
+  info: 'gl-text-blue-400',
+  unknown: 'gl-text-gray-400',
 };

app/assets/stylesheets/utilities.scss

@@ -4,15 +4,6 @@
   to see the available utility classes. If you cannot find the class you need,
   consider adding it to Gitlab UI before adding it here.
 **/
-
-@each $variant, $range in $color-ranges {
-  @each $suffix, $color in $range {
-    #{'.text-#{$variant}-#{$suffix}'} {
-      color: $color;
-    }
-  }
-}
-
 @each $index, $size in $type-scale {
   #{'.text-#{$index}'} {
     font-size: $size;

app/controllers/projects/issues_controller.rb

@@ -128,7 +128,7 @@ def new
       discussion_to_resolve: params[:discussion_to_resolve],
       confidential: !!Gitlab::Utils.to_boolean(issue_params[:confidential])
     )
-    service = ::Issues::BuildService.new(project: project, current_user: current_user, params: build_params)
+    service = ::Issues::BuildService.new(container: project, current_user: current_user, params: build_params)
 
     @issue = @noteable = service.execute
 

app/models/concerns/noteable.rb

@@ -106,9 +106,9 @@ def discussion_root_note_ids(notes_filter:)
 
     relations << discussion_notes.select(
       "'notes' AS table_name",
-      'discussion_id',
       'MIN(id) AS id',
-      'MIN(created_at) AS created_at'
+      'MIN(created_at) AS created_at',
+      'ARRAY_AGG(id) AS ids'
     ).with_notes_filter(notes_filter)
      .group(:discussion_id)
 
@@ -223,15 +223,16 @@ def synthetic_note_ids_relations
     # currently multiple models include Noteable concern, but not all of them support
     # all resource events, so we check if given model supports given resource event.
     if respond_to?(:resource_label_events)
-      relations << resource_label_events.select("'resource_label_events'", "'NULL'", :id, :created_at)
+      relations << resource_label_events.select("'resource_label_events'", 'MIN(id)', :created_at, 'ARRAY_AGG(id)')
+                     .group(:created_at, :user_id)
     end
 
     if respond_to?(:resource_state_events)
-      relations << resource_state_events.select("'resource_state_events'", "'NULL'", :id, :created_at)
+      relations << resource_state_events.select("'resource_state_events'", :id, :created_at, 'ARRAY_FILL(id, ARRAY[1])')
     end
 
     if respond_to?(:resource_milestone_events)
-      relations << resource_milestone_events.select("'resource_milestone_events'", "'NULL'", :id, :created_at)
+      relations << resource_milestone_events.select("'resource_milestone_events'", :id, :created_at, 'ARRAY_FILL(id, ARRAY[1])')
     end
 
     relations

app/services/issuable/discussions_list_service.rb

@@ -25,7 +25,7 @@ def execute
         paginated_discussions_by_type = paginator.records.group_by(&:table_name)
 
         notes = if paginated_discussions_by_type['notes'].present?
-                  notes.with_discussion_ids(paginated_discussions_by_type['notes'].map(&:discussion_id))
+                  notes.id_in(paginated_discussions_by_type['notes'].flat_map(&:ids))
                 else
                   notes.none
                 end

app/services/issues/build_service.rb

@@ -4,6 +4,11 @@ module Issues
   class BuildService < Issues::BaseService
     include ResolveDiscussions
 
+    # TODO: this is to be removed once we get to rename the IssuableBaseService project param to container
+    def initialize(container:, current_user: nil, params: {})
+      super(project: container, current_user: current_user, params: params)
+    end
+
     def execute
       filter_resolve_discussion_params
 

app/services/issues/create_service.rb

@@ -17,7 +17,7 @@ def initialize(project:, spam_params:, current_user: nil, params: {}, build_serv
       @extra_params = params.delete(:extra_params) || {}
       super(project: project, current_user: current_user, params: params)
       @spam_params = spam_params
-      @build_service = build_service || BuildService.new(project: project, current_user: current_user, params: params)
+      @build_service = build_service || BuildService.new(container: project, current_user: current_user, params: params)
     end
 
     def execute(skip_system_notes: false)

app/services/resource_events/base_synthetic_notes_builder_service.rb

@@ -32,7 +32,7 @@ def apply_pagination(events)
       return events if params[:paginated_notes].nil?
       return events.none if params[:paginated_notes][table_name].blank?
 
-      events.id_in(params[:paginated_notes][table_name].map(&:id))
+      events.id_in(params[:paginated_notes][table_name].flat_map(&:ids))
     end
 
     def apply_last_fetched_at(events)

app/services/tasks_to_be_done/base_service.rb

@@ -19,7 +19,7 @@ def execute
         update_service = Issues::UpdateService.new(project: project, current_user: current_user, params: { add_assignee_ids: params[:assignee_ids] })
         update_service.execute(issue)
       else
-        build_service = Issues::BuildService.new(project: project, current_user: current_user, params: params)
+        build_service = Issues::BuildService.new(container: project, current_user: current_user, params: params)
         create(build_service.execute)
       end
     end

app/services/work_items/create_service.rb

@@ -10,7 +10,7 @@ def initialize(project:, spam_params:, current_user: nil, params: {}, widget_par
         current_user: current_user,
         params: params,
         spam_params: spam_params,
-        build_service: ::WorkItems::BuildService.new(project: project, current_user: current_user, params: params)
+        build_service: ::WorkItems::BuildService.new(container: project, current_user: current_user, params: params)
       )
       @widget_params = widget_params
     end

config/feature_flags/development/elasticsearch_use_traversal_id_optimization.yml

@@ -0,0 +1,8 @@
+---
+name: elasticsearch_use_traversal_id_optimization
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108135
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/391286
+milestone: '15.9'
+type: development
+group: group::global search
+default_enabled: false

config/feature_flags/development/validate_environment_tier_presence.yml

@@ -1,7 +1,7 @@
 name: validate_environment_tier_presence
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111011
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385253
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/391293
 milestone: '15.9'
 type: development
 group: group::release
-default_enabled: false
+default_enabled: true

danger/stable_branch_patch/Dangerfile

@@ -1,3 +1,14 @@
 # frozen_string_literal: true
 
+if stable_branch.non_security_stable_branch?
+  markdown(<<~MARKDOWN)
+  ### QA `e2e:package-and-test`
+
+  **@#{helper.mr_author}, the `package-and-test` job must complete before merging this merge request.***
+
+  If there are failures on the `package-and-test` pipeline, ping your team's associated Software Engineer in Test (SET) to confirm
+  the failures are unrelated to the merge request. If there's no SET assigned, ask for assistance on the `#quality` Slack channel.
+  MARKDOWN
+end
+
 stable_branch.check!

db/post_migrate/20221108045019_truncate_timeline_event_tags_table.rb

@@ -4,6 +4,8 @@ class TruncateTimelineEventTagsTable < Gitlab::Database::Migration[2.0]
   disable_ddl_transaction!
 
   def up
+    return unless Gitlab::Database.gitlab_schemas_for_connection(connection).include?(:gitlab_main)
+
     execute('TRUNCATE TABLE incident_management_timeline_event_tags, incident_management_timeline_event_tag_links')
   end