.rubocop_todo/layout/first_array_element_indentation.yml

@@ -281,7 +281,6 @@ Layout/FirstArrayElementIndentation:
     - 'spec/models/ci/pipeline_spec.rb'
     - 'spec/models/ci/unit_test_spec.rb'
     - 'spec/models/clusters/applications/cert_manager_spec.rb'
-    - 'spec/models/clusters/applications/elastic_stack_spec.rb'
     - 'spec/models/clusters/platforms/kubernetes_spec.rb'
     - 'spec/models/commit_collection_spec.rb'
     - 'spec/models/compare_spec.rb'

.rubocop_todo/layout/space_inside_block_braces.yml

@@ -264,7 +264,6 @@ Layout/SpaceInsideBlockBraces:
     - 'lib/gitlab/contributions_calendar.rb'
     - 'lib/gitlab/database/migrations/test_background_runner.rb'
     - 'lib/gitlab/database/postgres_hll/buckets.rb'
-    - 'lib/gitlab/elasticsearch/logs/lines.rb'
     - 'lib/gitlab/email/message/in_product_marketing/helper.rb'
     - 'lib/gitlab/issues/rebalancing/state.rb'
     - 'lib/gitlab/profiler.rb'
@@ -552,7 +551,6 @@ Layout/SpaceInsideBlockBraces:
     - 'spec/models/ci/pipeline_schedule_spec.rb'
     - 'spec/models/ci/pipeline_spec.rb'
     - 'spec/models/ci/runner_spec.rb'
-    - 'spec/models/clusters/applications/elastic_stack_spec.rb'
     - 'spec/models/clusters/cluster_spec.rb'
     - 'spec/models/commit_status_spec.rb'
     - 'spec/models/concerns/chronic_duration_attribute_spec.rb'

.rubocop_todo/rails/file_path.yml

@@ -8,7 +8,6 @@ Rails/FilePath:
     - 'app/controllers/help_controller.rb'
     - 'app/helpers/startupjs_helper.rb'
     - 'app/models/clusters/applications/cert_manager.rb'
-    - 'app/models/clusters/applications/elastic_stack.rb'
     - 'app/models/clusters/concerns/application_data.rb'
     - 'app/models/concerns/cross_database_modification.rb'
     - 'app/models/release_highlight.rb'

.rubocop_todo/rails/inverse_of.yml

@@ -31,7 +31,6 @@ Rails/InverseOf:
     - 'app/models/clusters/applications/runner.rb'
     - 'app/models/clusters/cluster.rb'
     - 'app/models/clusters/concerns/application_core.rb'
-    - 'app/models/clusters/integrations/elastic_stack.rb'
     - 'app/models/clusters/integrations/prometheus.rb'
     - 'app/models/clusters/project.rb'
     - 'app/models/commit_signatures/x509_commit_signature.rb'

.rubocop_todo/rails/redundant_foreign_key.yml

@@ -19,7 +19,6 @@ Rails/RedundantForeignKey:
     - 'app/models/ci/unit_test_failure.rb'
     - 'app/models/clusters/applications/runner.rb'
     - 'app/models/clusters/concerns/application_core.rb'
-    - 'app/models/clusters/integrations/elastic_stack.rb'
     - 'app/models/clusters/integrations/prometheus.rb'
     - 'app/models/commit_signatures/x509_commit_signature.rb'
     - 'app/models/concerns/analytics/cycle_analytics/stage.rb'

.rubocop_todo/rspec/context_wording.yml

@@ -2640,7 +2640,6 @@ RSpec/ContextWording:
     - 'spec/models/clusters/agent_spec.rb'
     - 'spec/models/clusters/applications/cert_manager_spec.rb'
     - 'spec/models/clusters/applications/crossplane_spec.rb'
-    - 'spec/models/clusters/applications/elastic_stack_spec.rb'
     - 'spec/models/clusters/applications/helm_spec.rb'
     - 'spec/models/clusters/applications/ingress_spec.rb'
     - 'spec/models/clusters/applications/jupyter_spec.rb'

.rubocop_todo/style/percent_literal_delimiters.yml

@@ -165,8 +165,6 @@ Style/PercentLiteralDelimiters:
     - 'app/services/merge_requests/update_service.rb'
     - 'app/services/metrics/dashboard/default_embed_service.rb'
     - 'app/services/packages/debian/generate_distribution_service.rb'
-    - 'app/services/pod_logs/base_service.rb'
-    - 'app/services/pod_logs/elasticsearch_service.rb'
     - 'app/services/preview_markdown_service.rb'
     - 'app/services/projects/apple_target_platform_detector_service.rb'
     - 'app/services/projects/container_repository/cleanup_tags_service.rb'
@@ -673,7 +671,6 @@ Style/PercentLiteralDelimiters:
     - 'spec/factories/ci/runners.rb'
     - 'spec/factories/clusters/applications/helm.rb'
     - 'spec/factories/clusters/clusters.rb'
-    - 'spec/factories/clusters/integrations/elastic_stack.rb'
     - 'spec/factories/clusters/integrations/prometheus.rb'
     - 'spec/factories/clusters/providers/aws.rb'
     - 'spec/factories/deployments.rb'

app/assets/stylesheets/page_bundles/project.scss

@@ -128,10 +128,6 @@
     > li {
       display: inline-block;
 
-      &:not(:last-child) {
-        margin-right: $gl-padding;
-      }
-
       &.right {
         vertical-align: top;
         margin-top: 0;
@@ -179,7 +175,6 @@
     }
 
     .btn {
-      margin-bottom: $gl-padding-8;
       padding: $gl-btn-vert-padding $gl-btn-padding;
       line-height: $gl-btn-line-height;
 
@@ -190,12 +185,6 @@
   }
 }
 
-.project-buttons {
-  .nav > li:not(:last-child) {
-    margin-right: $gl-padding-8;
-  }
-}
-
 .git-empty {
   margin-bottom: 7px;
 

app/helpers/users/callouts_helper.rb

@@ -9,7 +9,6 @@ module CalloutsHelper
     FEATURE_FLAGS_NEW_VERSION = 'feature_flags_new_version'
     REGISTRATION_ENABLED_CALLOUT = 'registration_enabled_callout'
     UNFINISHED_TAG_CLEANUP_CALLOUT = 'unfinished_tag_cleanup_callout'
-    MINUTE_LIMIT_BANNER = 'minute_limit_banner'
     SECURITY_NEWSLETTER_CALLOUT = 'security_newsletter_callout'
     REGISTRATION_ENABLED_CALLOUT_ALLOWED_CONTROLLER_PATHS = [/^root/, /^dashboard\S*/, /^admin\S*/].freeze
 
@@ -61,10 +60,6 @@ def show_security_newsletter_user_callout?
         !user_dismissed?(SECURITY_NEWSLETTER_CALLOUT)
     end
 
-    def minute_limit_banner_dismissed?
-      user_dismissed?(MINUTE_LIMIT_BANNER)
-    end
-
     private
 
     def user_dismissed?(feature_name, ignore_dismissal_earlier_than = nil)

app/models/ci/build.rb

@@ -1135,6 +1135,14 @@ def track_deployment_usage
       Gitlab::Utils::UsageData.track_usage_event('ci_users_executing_deployment_job', user_id) if user_id.present? && count_user_deployment?
     end
 
+    def track_verify_usage
+      Gitlab::Utils::UsageData.track_usage_event('ci_users_executing_verify_environment_job', user_id) if user_id.present? && count_user_verification?
+    end
+
+    def count_user_verification?
+      has_environment? && environment_action == 'verify'
+    end
+
     def each_report(report_types)
       job_artifacts_for_types(report_types).each do |report_artifact|
         report_artifact.each_blob do |blob|

app/models/users/callout.rb

@@ -49,7 +49,9 @@ class Callout < ApplicationRecord
       storage_enforcement_banner_fourth_enforcement_threshold: 46,
       attention_requests_top_nav: 47,
       attention_requests_side_nav: 48,
-      minute_limit_banner: 49,
+      # 49 was removed with https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91533
+      # because the banner was no longer relevant.
+      # Records will be migrated with https://gitlab.com/gitlab-org/gitlab/-/issues/367293
       preview_user_over_limit_free_plan_alert: 50, # EE-only
       user_reached_limit_free_plan_alert: 51, # EE-only
       submit_license_usage_data_banner: 52, # EE-only

app/models/wiki_page.rb

@@ -316,6 +316,7 @@ def serialize_front_matter(hash)
   end
 
   def update_front_matter(attrs)
+    return unless Gitlab::WikiPages::FrontMatterParser.enabled?(container)
     return unless attrs.has_key?(:front_matter)
 
     fm_yaml = serialize_front_matter(attrs[:front_matter])
@@ -326,7 +327,7 @@ def update_front_matter(attrs)
 
   def parsed_content
     strong_memoize(:parsed_content) do
-      Gitlab::WikiPages::FrontMatterParser.new(raw_content).parse
+      Gitlab::WikiPages::FrontMatterParser.new(raw_content, container).parse
     end
   end
 

app/views/projects/_files.html.haml

@@ -16,7 +16,7 @@
     #js-code-owners
 
   - if is_project_overview
-    .project-buttons.gl-mb-3.js-show-on-project-root
+    .project-buttons.gl-mb-5.js-show-on-project-root
       = render 'stat_anchor_list', anchors: @project.statistics_buttons(show_auto_devops_callout: show_auto_devops_callout), project_buttons: true
 
   #js-tree-list{ data: vue_file_list_data(project, ref) }

app/views/projects/_stat_anchor_list.html.haml

@@ -2,7 +2,7 @@
 - project_buttons = local_assigns.fetch(:project_buttons, false)
 
 - return unless anchors.any?
-%ul.nav
+%ul.nav.gl-gap-3
   - anchors.each do |anchor|
     %li.nav-item
       = link_to_if(anchor.link, anchor.label, anchor.link, stat_anchor_attrs(anchor)) do

app/views/projects/activity.html.haml

 - page_title _("Activity")
-= render_if_exists 'shared/minute_limit_banner', namespace: @project
 
 = render 'projects/last_push'
 = render 'projects/activity'

app/views/projects/edit.html.haml

@@ -5,8 +5,6 @@
 - expanded = expanded_by_default?
 - reduce_visibility_form_id = 'reduce-visibility-form'
 
-= render_if_exists 'shared/minute_limit_banner', namespace: @project
-
 %section.settings.general-settings.no-animate.expanded#js-general-settings
   .settings-header
     %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only= _('Naming, topics, avatar')

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

@@ -4,7 +4,6 @@
 - subscribed = params[:subscribed]
 - labels_or_filters = @labels.exists? || @prioritized_labels.exists? || search.present? || subscribed.present?
 
-= render_if_exists 'shared/minute_limit_banner', namespace: @project
 - if labels_or_filters
   #js-promote-label-modal
   = render 'shared/labels/nav', labels_or_filters: labels_or_filters, can_admin_label: can_admin_label

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

@@ -2,7 +2,6 @@
 - page_title _("Members")
 
 = render_if_exists 'projects/free_user_cap_alert', project: @project
-= render_if_exists 'shared/minute_limit_banner', namespace: @project
 
 .row.gl-mt-3
   .col-lg-12

app/views/projects/show.html.haml

@@ -7,7 +7,6 @@
   = auto_discovery_link_tag(:atom, project_path(@project, rss_url_options), title: "#{@project.name} activity")
 
 = render_if_exists 'projects/free_user_cap_alert', project: @project
-= render_if_exists 'shared/minute_limit_banner', namespace: @project
 = render partial: 'flash_messages', locals: { project: @project }
 = render 'clusters_deprecation_alert'
 

app/workers/ci/archive_trace_worker.rb

@@ -4,17 +4,13 @@ module Ci
   class ArchiveTraceWorker # rubocop:disable Scalability/IdempotentWorker
     include ApplicationWorker
 
-    data_consistency :sticky, feature_flag: :sticky_ci_archive_trace_worker
+    data_consistency :sticky
 
     sidekiq_options retry: 3
     include PipelineBackgroundQueue
 
     def perform(job_id)
-      archivable_jobs = Ci::Build.without_archived_trace
-
-      if Feature.enabled?(:sticky_ci_archive_trace_worker)
-        archivable_jobs = archivable_jobs.eager_load_for_archiving_trace
-      end
+      archivable_jobs = Ci::Build.without_archived_trace.eager_load_for_archiving_trace
 
       archivable_jobs.find_by_id(job_id).try do |job|
         Ci::ArchiveTraceService.new.execute(job, worker_name: self.class.name)