Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.browserslistrc

@@ -3,14 +3,13 @@
 # https://docs.gitlab.com/ee/install/requirements.html#supported-web-browsers
 # with the following reasoning:
 #
-# - We should support the latest ESR of Firefox: 78, because it used quite a lot.
-# - We use Edge/Chrome >= 84 because 83 had an annoying bug which would mean we
-#   need to polyfill Array.reduce: https://bugs.chromium.org/p/chromium/issues/detail?id=1049982
-# - Safari 13.1 because it is the current minor version of the previous major version
+# - We should support the latest ESR of Firefox: 91, because it used quite a lot.
+# - We use Edge/Chrome >= 92 because they are about as old as the Firefox ESR
+# - Safari 14.1 because it is the current minor version of the previous major version
 #
 # See also this epic: https://gitlab.com/groups/gitlab-org/-/epics/3957
 #
-chrome >= 84
-edge >= 84
-firefox >= 78
-safari >= 13.1
+chrome >= 92
+edge >= 92
+firefox >= 91
+safari >= 14.1

.gitlab/ci/global.gitlab-ci.yml

@@ -79,7 +79,7 @@
   policy: push  # We want to rebuild the cache from scratch to ensure stale dependencies are cleaned up.
 
 .assets-cache: &assets-cache
-  key: "assets-debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}-node-${NODE_ENV}"
+  key: "assets-debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}-node-${NODE_ENV}-v2"
   paths:
     - assets-hash.txt
     - public/assets/webpack/

app/assets/stylesheets/pages/issuable.scss

@@ -296,7 +296,7 @@
         @include media-breakpoint-up(lg) {
           padding: 0;
 
-          form {
+          .issuable-context-form {
             --initial-top: calc(#{$header-height} + #{$mr-tabs-height});
             --top: var(--initial-top);
 

app/assets/stylesheets/startup/startup-dark.scss

@@ -2056,7 +2056,6 @@ body.gl-dark {
   --nav-active-bg: rgba(255, 255, 255, 0.08);
 }
 .tab-width-8 {
-  -moz-tab-size: 8;
   tab-size: 8;
 }
 .gl-sr-only {

app/assets/stylesheets/startup/startup-general.scss

@@ -1698,7 +1698,6 @@ svg.s16 {
 }
 
 .tab-width-8 {
-  -moz-tab-size: 8;
   tab-size: 8;
 }
 .gl-sr-only {

app/assets/stylesheets/utilities.scss

@@ -366,3 +366,7 @@ to @gitlab/ui by https://gitlab.com/gitlab-org/gitlab-ui/-/issues/1709
   /* stylelint-disable property-no-vendor-prefix */
   -webkit-backdrop-filter: blur(2px); // still required by Safari
 }
+
+.gl-flex-flow-row-wrap {
+  flex-flow: row wrap;
+}

app/controllers/admin/broadcast_messages_controller.rb

@@ -5,7 +5,7 @@ class Admin::BroadcastMessagesController < Admin::ApplicationController
 
   before_action :finder, only: [:edit, :update, :destroy]
 
-  feature_category :navigation
+  feature_category :onboarding
   urgency :low
 
   # rubocop: disable CodeReuse/ActiveRecord

app/finders/ci/runners_finder.rb

@@ -17,6 +17,7 @@ def execute
       search!
       filter_by_active!
       filter_by_status!
+      filter_by_upgrade_status!
       filter_by_runner_type!
       filter_by_tag_list!
       sort!
@@ -67,6 +68,13 @@ def filter_by_status!
       filter_by!(:status_status, Ci::Runner::AVAILABLE_STATUSES)
     end
 
+    def filter_by_upgrade_status!
+      return unless @params.key?(:upgrade_status)
+      return unless Ci::RunnerVersion.statuses.key?(@params[:upgrade_status])
+
+      @runners = @runners.with_upgrade_status(@params[:upgrade_status])
+    end
+
     def filter_by_runner_type!
       filter_by!(:type_type, Ci::Runner::AVAILABLE_TYPES)
     end

app/graphql/mutations/concerns/mutations/work_items/widgetable.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Mutations
+  module WorkItems
+    module Widgetable
+      extend ActiveSupport::Concern
+
+      def extract_widget_params(work_item_type, attributes)
+        # Get the list of widgets for the work item's type to extract only the supported attributes
+        widget_keys = work_item_type.widgets.map(&:api_symbol)
+        widget_params = attributes.extract!(*widget_keys)
+
+        # Cannot use prepare to use `.to_h` on each input due to
+        # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87472#note_945199865
+        widget_params.transform_values { |values| values.to_h }
+      end
+    end
+  end
+end

app/graphql/mutations/work_items/create.rb

@@ -7,6 +7,7 @@ class Create < BaseMutation
 
       include Mutations::SpamProtection
       include FindsProject
+      include Mutations::WorkItems::Widgetable
 
       description "Creates a work item. Available only when feature flag `work_items` is enabled."
 
@@ -15,6 +16,9 @@ class Create < BaseMutation
       argument :description, GraphQL::Types::String,
                required: false,
                description: copy_field_description(Types::WorkItemType, :description)
+      argument :hierarchy_widget, ::Types::WorkItems::Widgets::HierarchyCreateInputType,
+               required: false,
+               description: 'Input for hierarchy widget.'
       argument :project_path, GraphQL::Types::ID,
                required: true,
                description: 'Full path of the project the work item is associated with.'
@@ -36,10 +40,18 @@ def resolve(project_path:, **attributes)
           return { errors: ['`work_items` feature flag disabled for this project'] }
         end
 
+        spam_params = ::Spam::SpamParams.new_from_request(request: context[:request])
         params = global_id_compatibility_params(attributes).merge(author_id: current_user.id)
+        type = ::WorkItems::Type.find(attributes[:work_item_type_id])
+        widget_params = extract_widget_params(type, params)
 
-        spam_params = ::Spam::SpamParams.new_from_request(request: context[:request])
-        create_result = ::WorkItems::CreateService.new(project: project, current_user: current_user, params: params, spam_params: spam_params).execute
+        create_result = ::WorkItems::CreateService.new(
+          project: project,
+          current_user: current_user,
+          params: params,
+          spam_params: spam_params,
+          widget_params: widget_params
+        ).execute
 
         check_spam_action_response!(create_result[:work_item]) if create_result[:work_item]
 

app/graphql/mutations/work_items/update.rb

@@ -9,6 +9,7 @@ class Update < BaseMutation
 
       include Mutations::SpamProtection
       include Mutations::WorkItems::UpdateArguments
+      include Mutations::WorkItems::Widgetable
 
       authorize :update_work_item
 
@@ -24,7 +25,7 @@ def resolve(id:, **attributes)
         end
 
         spam_params = ::Spam::SpamParams.new_from_request(request: context[:request])
-        widget_params = extract_widget_params(work_item, attributes)
+        widget_params = extract_widget_params(work_item.work_item_type, attributes)
 
         update_result = ::WorkItems::UpdateService.new(
           project: work_item.project,
@@ -47,16 +48,6 @@ def resolve(id:, **attributes)
       def find_object(id:)
         GitlabSchema.find_by_gid(id)
       end
-
-      def extract_widget_params(work_item, attributes)
-        # Get the list of widgets for the work item's type to extract only the supported attributes
-        widget_keys = work_item.work_item_type.widgets.map(&:api_symbol)
-        widget_params = attributes.extract!(*widget_keys)
-
-        # Cannot use prepare to use `.to_h` on each input due to
-        # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87472#note_945199865
-        widget_params.transform_values { |values| values.to_h }
-      end
     end
   end
 end

app/graphql/resolvers/ci/runners_resolver.rb

@@ -36,6 +36,10 @@ class RunnersResolver < BaseResolver
                required: false,
                description: 'Sort order of results.'
 
+      argument :upgrade_status, ::Types::Ci::RunnerUpgradeStatusTypeEnum,
+               required: false,
+               description: 'Filter by upgrade status.'
+
       def resolve_with_lookahead(**args)
         apply_lookahead(
           ::Ci::RunnersFinder
@@ -54,6 +58,7 @@ def runners_finder_params(params)
           status_status: params[:status]&.to_s,
           type_type: params[:type],
           tag_name: params[:tag_list],
+          upgrade_status: params[:upgrade_status],
           search: params[:search],
           sort: params[:sort]&.to_s,
           preload: {

app/graphql/types/work_items/widgets/hierarchy_create_input_type.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Types
+  module WorkItems
+    module Widgets
+      class HierarchyCreateInputType < BaseInputObject
+        graphql_name 'WorkItemWidgetHierarchyCreateInput'
+
+        argument :parent_id, ::Types::GlobalIDType[::WorkItem],
+                 required: false,
+                 description: 'Global ID of the parent work item.',
+                 prepare: ->(id, _) { id&.model_id }
+      end
+    end
+  end
+end

app/helpers/nav/new_dropdown_helper.rb

@@ -16,7 +16,7 @@ def new_dropdown_view_model(group:, project:)
       menu_sections.push(general_menu_section)
 
       {
-        title: _("Create new"),
+        title: _("Create new..."),
         menu_sections: menu_sections.select { |x| x.fetch(:menu_items).any? }
       }
     end

app/models/ci/runner.rb

@@ -78,6 +78,7 @@ class Runner < Ci::ApplicationRecord
     has_many :groups, through: :runner_namespaces, disable_joins: true
 
     has_one :last_build, -> { order('id DESC') }, class_name: 'Ci::Build'
+    has_one :runner_version, primary_key: :version, foreign_key: :version, class_name: 'Ci::RunnerVersion'
 
     before_save :ensure_token
 
@@ -475,6 +476,10 @@ def self.token_expiration_enforced?
 
     private
 
+    scope :with_upgrade_status, ->(upgrade_status) do
+      Ci::Runner.joins(:runner_version).where(runner_version: { status: upgrade_status })
+    end
+
     EXECUTOR_NAME_TO_TYPES = {
       'unknown' => :unknown,
       'custom' => :custom,

app/models/work_item.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class WorkItem < Issue
+  include Gitlab::Utils::StrongMemoize
+
   self.table_name = 'issues'
   self.inheritance_column = :_type_disabled
 
@@ -23,8 +25,10 @@ def noteable_target_type_name
   end
 
   def widgets
-    work_item_type.widgets.map do |widget_class|
-      widget_class.new(self)
+    strong_memoize(:widgets) do
+      work_item_type.widgets.map do |widget_class|
+        widget_class.new(self)
+      end
     end
   end
 

app/services/concerns/work_items/widgetable_service.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module WorkItems
+  module WidgetableService
+    def execute_widgets(work_item:, callback:, widget_params: {})
+      work_item.widgets.each do |widget|
+        widget_service(widget).try(callback, params: widget_params[widget.class.api_symbol])
+      end
+    end
+
+    # rubocop:disable Gitlab/ModuleWithInstanceVariables
+    def widget_service(widget)
+      @widget_services ||= {}
+      return @widget_services[widget] if @widget_services.has_key?(widget)
+
+      @widget_services[widget] = widget_service_class(widget)&.new(widget: widget, current_user: current_user)
+    end
+    # rubocop:enable Gitlab/ModuleWithInstanceVariables
+
+    def widget_service_class(widget)
+      "WorkItems::Widgets::#{widget.type.capitalize}Service::#{self.class.name.demodulize}".constantize
+    rescue NameError
+      nil
+    end
+  end
+end

app/services/issuable_base_service.rb

@@ -231,7 +231,7 @@ def create(issuable, skip_system_notes: false)
     before_create(issuable)
 
     issuable_saved = issuable.with_transaction_returning_status do
-      issuable.save
+      transaction_create(issuable)
     end
 
     if issuable_saved
@@ -339,6 +339,10 @@ def transaction_update(issuable, opts = {})
     issuable.save(touch: touch)
   end
 
+  def transaction_create(issuable)
+    issuable.save
+  end
+
   def update_task(issuable)
     filter_params(issuable)
 

app/services/work_items/create_service.rb

@@ -1,33 +1,41 @@
 # frozen_string_literal: true
 
 module WorkItems
-  class CreateService
+  class CreateService < Issues::CreateService
     include ::Services::ReturnServiceResponses
+    include WidgetableService
 
-    def initialize(project:, current_user: nil, params: {}, spam_params:)
-      @create_service = ::Issues::CreateService.new(
+    def initialize(project:, current_user: nil, params: {}, spam_params:, widget_params: {})
+      super(
         project: project,
         current_user: current_user,
         params: params,
         spam_params: spam_params,
         build_service: ::WorkItems::BuildService.new(project: project, current_user: current_user, params: params)
       )
-      @current_user = current_user
-      @project = project
+      @widget_params = widget_params
     end
 
     def execute
       unless @current_user.can?(:create_work_item, @project)
         return error(_('Operation not allowed'), :forbidden)
       end
 
-      work_item = @create_service.execute
+      work_item = super
 
       if work_item.valid?
         success(payload(work_item))
       else
         error(work_item.errors.full_messages, :unprocessable_entity, pass_back: payload(work_item))
       end
+    rescue ::WorkItems::Widgets::BaseService::WidgetError => e
+      error(e.message, :unprocessable_entity)
+    end
+
+    def transaction_create(work_item)
+      super
+
+      execute_widgets(work_item: work_item, callback: :after_create_in_transaction, widget_params: @widget_params)
     end
 
     private