app/graphql/types/query_type.rb

@@ -50,8 +50,7 @@ class QueryType < ::Types::BaseObject
           alpha: { milestone: '15.6' },
           resolver: Resolvers::IssuesResolver,
           description: 'Find issues visible to the current user.' \
-                       ' At least one filter must be provided.' \
-                       ' Returns `null` if the `root_level_issues_query` feature flag is disabled.'
+                       ' At least one filter must be provided.'
     field :jobs,
           ::Types::Ci::JobType.connection_type,
           null: true,

app/helpers/application_helper.rb

@@ -232,7 +232,7 @@ def promo_url
   end
 
   def support_url
-    Gitlab::CurrentSettings.current_application_settings.help_page_support_url.presence || "#{promo_url}/getting-help/"
+    Gitlab::CurrentSettings.current_application_settings.help_page_support_url.presence || "#{promo_url}/get-help/"
   end
 
   def instance_review_permitted?

app/helpers/listbox_helper.rb

@@ -23,7 +23,7 @@ module ListboxHelper
   #
   # The final parameter `html_options` applies arbitrary attributes to the
   # returned tag. Some of these are passed to the underlying Vue component as
-  # props, e.g., to right-align the menu of items, add `data: { right: true }`.
+  # props, e.g., to right-align the menu of items, add `data: { placement: 'right' }`.
   #
   # Examples:
   #   # Create a listbox with two items, with the first item selected
@@ -32,7 +32,7 @@ module ListboxHelper
   #   = gl_redirect_listbox_tag items, 'foo'
   #
   #   # Create the same listbox, right-align the menu and add margin styling
-  #   = gl_redirect_listbox_tag items, 'foo', class: 'gl-ml-3', data: { right: true }
+  #   = gl_redirect_listbox_tag items, 'foo', class: 'gl-ml-3', data: { placement: 'right' }
   def gl_redirect_listbox_tag(items, selected, html_options = {})
     # Add script tag for app/assets/javascripts/entrypoints/behaviors/redirect_listbox.js
     content_for :page_specific_javascripts do

app/helpers/nav/new_dropdown_helper.rb

@@ -59,7 +59,7 @@ def group_menu_section(group)
       end
 
       {
-        title: _('This group'),
+        title: _('In this group'),
         menu_items: menu_items.compact
       }
     end
@@ -110,7 +110,7 @@ def project_menu_section(project)
       end
 
       {
-        title: _('This project'),
+        title: _('In this project'),
         menu_items: menu_items
       }
     end
@@ -152,7 +152,7 @@ def general_menu_section
       end
 
       {
-        title: _('GitLab'),
+        title: _('In GitLab'),
         menu_items: menu_items
       }
     end

app/helpers/projects_helper.rb

@@ -304,11 +304,7 @@ def explore_projects_tab?
       current_page?(starred_explore_projects_path)
   end
 
-  def show_merge_request_count?(disabled: false, compact_mode: false)
-    !disabled && !compact_mode
-  end
-
-  def show_issue_count?(disabled: false, compact_mode: false)
+  def show_count?(disabled: false, compact_mode: false)
     !disabled && !compact_mode
   end
 
@@ -439,6 +435,10 @@ def able_to_see_merge_requests?(project, user)
     project.merge_requests_enabled? && can?(user, :read_merge_request, project)
   end
 
+  def able_to_see_forks_count?(project, user)
+    project.forking_enabled? && can?(user, :read_code, project)
+  end
+
   def fork_button_disabled_tooltip(project)
     return unless current_user
 

app/helpers/sidebars_helper.rb

 # frozen_string_literal: true
 
 module SidebarsHelper
+  include Nav::NewDropdownHelper
+
   def sidebar_tracking_attributes_by_object(object)
     sidebar_attributes_for_object(object).fetch(:tracking_attrs, {})
   end
@@ -31,7 +33,7 @@ def group_sidebar_context(group, user)
     Sidebars::Groups::Context.new(**context_data)
   end
 
-  def super_sidebar_context(user)
+  def super_sidebar_context(user, group:, project:)
     {
       name: user.name,
       username: user.username,
@@ -39,12 +41,29 @@ def super_sidebar_context(user)
       assigned_open_issues_count: user.assigned_open_issues_count,
       assigned_open_merge_requests_count: user.assigned_open_merge_requests_count,
       todos_pending_count: user.todos_pending_count,
-      issues_dashboard_path: issues_dashboard_path(assignee_username: user.username)
+      issues_dashboard_path: issues_dashboard_path(assignee_username: user.username),
+      create_new_menu_groups: create_new_menu_groups(group: group, project: project)
     }
   end
 
   private
 
+  def create_new_menu_groups(group:, project:)
+    new_dropdown_sections = new_dropdown_view_model(group: group, project: project)[:menu_sections]
+    show_headers = new_dropdown_sections.length > 1
+    new_dropdown_sections.map do |section|
+      {
+        name: show_headers ? section[:title] : '',
+        items: section[:menu_items].map do |item|
+          {
+            text: item[:title],
+            href: item[:href]
+          }
+        end
+      }
+    end
+  end
+
   def sidebar_attributes_for_object(object)
     case object
     when Project

app/models/abuse_report.rb

@@ -4,6 +4,8 @@ class AbuseReport < ApplicationRecord
   include CacheMarkdownField
   include Sortable
 
+  MAX_CHAR_LIMIT_URL = 512
+
   cache_markdown_field :message, pipeline: :single_line
 
   belongs_to :reporter, class_name: 'User'
@@ -23,13 +25,23 @@ class AbuseReport < ApplicationRecord
 
   validates :reported_from_url,
             allow_blank: true,
-            length: { maximum: 512 },
+            length: { maximum: MAX_CHAR_LIMIT_URL },
             addressable_url: {
               dns_rebind_protection: true,
               blocked_message: 'is an invalid URL. You can try reporting the abuse again, ' \
                                'or contact a GitLab administrator for help.'
             }
 
+  validates :links_to_spam,
+            allow_blank: true,
+            length: {
+              maximum: 20,
+              message: N_("exceeds the limit of %{count} links")
+            }
+
+  before_validation :filter_empty_strings_from_links_to_spam
+  validate :links_to_spam_contains_valid_urls
+
   scope :by_user, ->(user) { where(user_id: user) }
   scope :with_users, -> { includes(:reporter, :user) }
 
@@ -64,4 +76,34 @@ def notify
 
     AbuseReportMailer.notify(self.id).deliver_later
   end
+
+  private
+
+  def filter_empty_strings_from_links_to_spam
+    return if links_to_spam.blank?
+
+    links_to_spam.reject!(&:empty?)
+  end
+
+  def links_to_spam_contains_valid_urls
+    return if links_to_spam.blank?
+
+    links_to_spam.each do |link|
+      Gitlab::UrlBlocker.validate!(
+        link,
+          schemes: %w[http https],
+          allow_localhost: true,
+          dns_rebind_protection: true
+      )
+
+      next unless link.length > MAX_CHAR_LIMIT_URL
+
+      errors.add(
+        :links_to_spam,
+        format(_('contains URLs that exceed the %{limit} character limit'), limit: MAX_CHAR_LIMIT_URL)
+      )
+    end
+  rescue ::Gitlab::UrlBlocker::BlockedUrlError
+    errors.add(:links_to_spam, _('only supports valid HTTP(S) URLs'))
+  end
 end

app/models/merge_request.rb

@@ -194,9 +194,7 @@ def self.available_state_names
     end
 
     before_transition any => :merged do |merge_request|
-      if ::Feature.enabled?(:reset_merge_error_on_transition, merge_request.project)
-        merge_request.merge_error = nil
-      end
+      merge_request.merge_error = nil
     end
 
     after_transition any => :opened do |merge_request|

app/models/project_authorization.rb

@@ -64,8 +64,7 @@ def self.delete_all_in_batches_for_user(user:, project_ids:, per_batch: BATCH_SI
     # catch up with the primary when large batches of records are being added/removed.
     # Hance, we add a delay only if the GitLab installation has a replica database configured.
     entire_size > batch_size &&
-      !::Gitlab::Database::LoadBalancing.primary_only? &&
-      Feature.enabled?(:enable_minor_delay_during_project_authorizations_refresh)
+      !::Gitlab::Database::LoadBalancing.primary_only?
   end
 
   private_class_method def self.log_details(entire_size:, batch_size:)

app/services/ci/create_downstream_pipeline_service.rb

@@ -89,7 +89,7 @@ def ensure_preconditions!(target_ref)
         return false
       end
 
-      if Feature.enabled?(:ci_limit_complete_hierarchy_size) && pipeline_tree_too_large?
+      if pipeline_tree_too_large?
         @bridge.drop!(:reached_max_pipeline_hierarchy_size)
         return false
       end

app/services/ci/runners/stale_machines_cleanup_service.rb

+# frozen_string_literal: true
+
+module Ci
+  module Runners
+    class StaleMachinesCleanupService
+      MAX_DELETIONS = 1000
+
+      def execute
+        ServiceResponse.success(payload: {
+          # the `stale` relationship can return duplicates, so we don't try to return a precise count here
+          deleted_machines: delete_stale_runner_machines > 0
+        })
+      end
+
+      private
+
+      def delete_stale_runner_machines
+        total_deleted_count = 0
+        loop do
+          sub_batch_limit = [100, MAX_DELETIONS].min
+
+          # delete_all discards part of the `stale` scope query, so we expliclitly wrap it with a SELECT as a workaround
+          deleted_count = Ci::RunnerMachine.id_in(Ci::RunnerMachine.stale.limit(sub_batch_limit)).delete_all
+          total_deleted_count += deleted_count
+
+          break if deleted_count == 0 || total_deleted_count >= MAX_DELETIONS
+        end
+
+        total_deleted_count
+      end
+    end
+  end
+end

app/views/abuse_reports/new.html.haml

@@ -8,7 +8,9 @@
       = _("A member of the abuse team will review your report as soon as possible.")
 
 = gitlab_ui_form_for @abuse_report, html: { class: 'js-quick-submit'} do |f|
-  = form_errors(@abuse_report)
+  .row
+    .col-lg-8
+      = form_errors(@abuse_report)
 
   = f.hidden_field :user_id
   = f.hidden_field :category
@@ -23,6 +25,7 @@
     .col-lg-8
       = f.label :reported_from
       = f.text_field :reported_from_url, class: "form-control", readonly: true
+  #js-links-to-spam{ data: { links: Array(@abuse_report.links_to_spam) } }
   .form-group.row
     .col-lg-8
       = f.label :reason

app/views/admin/application_settings/_help_page.html.haml

@@ -12,7 +12,7 @@
       = f.gitlab_ui_checkbox_component :help_page_hide_commercial_content, _('Hide marketing-related entries from the Help page')
     .form-group
       = f.label :help_page_support_url, _('Support page URL'), class: 'label-bold'
-      = f.text_field :help_page_support_url, class: 'form-control gl-form-input', placeholder: 'https://company.example.com/getting-help', :'aria-describedby' => 'support_help_block'
+      = f.text_field :help_page_support_url, class: 'form-control gl-form-input', placeholder: 'https://company.example.com/get-help', :'aria-describedby' => 'support_help_block'
       %span.form-text.text-muted#support_help_block= _('Alternate support URL for Help page and Help dropdown.')
 
     .form-group

app/views/admin/background_migrations/_migration.html.haml

@@ -12,14 +12,17 @@
     = gl_badge_tag migration.status_name.to_s.humanize, { size: :sm, variant: batched_migration_status_badge_variant(migration) }
   %td{ role: 'cell', data: { label: _('Action') } }
     - if migration.active?
-      = button_to pause_admin_background_migration_path(migration, database: params[:database]),
-        class: 'gl-button btn btn-icon has-tooltip', title: _('Pause'), 'aria-label' => _('Pause') do
-        = sprite_icon('pause', css_class: 'gl-button-icon gl-icon')
+      = render Pajamas::ButtonComponent.new(icon: 'pause',
+        method: :post,
+        href: pause_admin_background_migration_path(migration, database: params[:database]),
+        button_options: { class: 'has-tooltip', title: _('Pause'), 'aria-label' => _('Pause') })
     - elsif migration.paused?
-      = button_to resume_admin_background_migration_path(migration, database: params[:database]),
-        class: 'gl-button btn btn-icon has-tooltip', title: _('Resume'), 'aria-label' => _('Resume') do
-        = sprite_icon('play', css_class: 'gl-button-icon gl-icon')
+      = render Pajamas::ButtonComponent.new(icon: 'play',
+        method: :post,
+        href: resume_admin_background_migration_path(migration, database: params[:database]),
+        button_options: { class: 'has-tooltip', title: _('Resume'), 'aria-label' => _('Resume') })
     - elsif migration.failed?
-      = button_to retry_admin_background_migration_path(migration, database: params[:database]),
-        class: 'gl-button btn btn-icon has-tooltip', title: _('Retry'), 'aria-label' => _('Retry') do
-        = sprite_icon('retry', css_class: 'gl-button-icon gl-icon')
+      = render Pajamas::ButtonComponent.new(icon: 'retry',
+        method: :post,
+        href: retry_admin_background_migration_path(migration, database: params[:database]),
+        button_options: { class: 'has-tooltip', title: _('Retry'), 'aria-label' => _('Retry') })

app/views/admin/users/_users.html.haml

@@ -64,7 +64,7 @@
         = button_tag s_('AdminUsers|Search users') if Rails.env.test?
       .dropdown.gl-sm-ml-3
         = label_tag s_('AdminUsers|Sort by')
-        = gl_redirect_listbox_tag admin_users_sort_options(filter: params[:filter], search_query: params[:search_query]), @sort, data: { right: true }
+        = gl_redirect_listbox_tag admin_users_sort_options(filter: params[:filter], search_query: params[:search_query]), @sort, data: { placement: 'right' }
 
 #js-admin-users-app{ data: admin_users_data_attributes(@users) }
   = render Pajamas::SpinnerComponent.new(size: :lg, class: 'gl-my-7')

app/views/dashboard/issues.html.haml

@@ -13,7 +13,7 @@
 
   - if current_user
     .page-title-controls
-      = render 'shared/new_project_item_select', path: 'issues/new', label: _("issue"), with_feature_enabled: 'issues', type: :issues
+      = render 'shared/new_project_item_vue_select', path: 'issues/new', label: _("issue"), with_feature_enabled: 'issues', type: :issues
 
 - if ::Feature.enabled?(:vue_issues_dashboard)
   .js-issues-dashboard{ data: dashboard_issues_list_data(current_user) }

app/views/explore/projects/_filter.html.haml

@@ -4,4 +4,4 @@
 - if current_user
   - unless has_label
     %span.gl-float-left= _("Visibility:")
-  = gl_redirect_listbox_tag(projects_filter_items, selected, class: 'gl-ml-3', data: { right: true })
+  = gl_redirect_listbox_tag(projects_filter_items, selected, class: 'gl-ml-3', data: { placement: 'right' })

app/views/groups/projects.html.haml

@@ -38,8 +38,12 @@
             = render 'project_badges', project: project
 
           .controls.gl-flex-shrink-0.gl-ml-5
-            = link_to _('Members'), project_project_members_path(project), id: dom_id(project, :edit), class: "btn gl-button", data: { qa_selector: 'project_members_button' }
-            = link_to _('Edit'), edit_project_path(project), id: dom_id(project, :edit), class: "btn gl-button", data: { qa_selector: 'project_edit_button' }
+            = render Pajamas::ButtonComponent.new(href: project_project_members_path(project),
+              button_options: { data: { qa_selector: 'project_members_button' } }) do
+              = _('Members')
+            = render Pajamas::ButtonComponent.new(href: edit_project_path(project),
+              button_options: { data: { qa_selector: 'project_edit_button' } }) do
+              = _('Edit')
             = render 'delete_project_button', project: project, data: { qa_selector: 'project_delete_button' }
       - if @projects.blank?
         .nothing-here-block= _("This group has no projects yet")

app/views/layouts/_page.html.haml

@@ -2,7 +2,7 @@
   - @left_sidebar = true
 .layout-page.hide-when-top-nav-responsive-open{ class: page_with_sidebar_class }
   - if show_super_sidebar?
-    - sidebar_data = super_sidebar_context(current_user).to_json
+    - sidebar_data = super_sidebar_context(current_user, group: @group, project: @project).to_json
     %aside.js-super-sidebar.nav-sidebar{ data: { root_path: root_path, sidebar: sidebar_data, toggle_new_nav_endpoint: profile_preferences_url } }
   - elsif defined?(nav) && nav
     = render "layouts/nav/sidebar/#{nav}"

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

@@ -14,7 +14,7 @@
             %button.user-search-btn{ type: "submit", "aria-label" => _("Submit search") }
               = sprite_icon('search')
           - starrers_sort_options = starrers_sort_options_hash.map { |value, text| { value: value, text: text, href: filter_starrer_path(sort: value) } }
-          = gl_redirect_listbox_tag starrers_sort_options, @sort, class: 'gl-ml-3', data: { right: true }
+          = gl_redirect_listbox_tag starrers_sort_options, @sort, class: 'gl-ml-3', data: { placement: 'right' }
 - if @starrers.size > 0
   .row.gl-mt-3
     = render partial: 'starrer', collection: @starrers, as: :starrer