Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42

5 files changed, 96 insertions, 24 deletions

diff --git a/lib/api/helpers/issues_helpers.rb b/lib/api/helpers/issues_helpers.rb
index b1954f8ece9..185a10a250c 100644
--- a/lib/api/helpers/issues_helpers.rb
+++ b/lib/api/helpers/issues_helpers.rb
@@ -34,7 +34,17 @@ module API
       end
 
       def self.sort_options
-        %w[created_at updated_at priority due_date relative_position label_priority milestone_due popularity]
+        %w[
+          created_at
+          due_date
+          label_priority
+          milestone_due
+          popularity
+          priority
+          relative_position
+          title
+          updated_at
+        ]
       end
 
       def issue_finder(args = {})
@@ -43,9 +53,11 @@ module API
         args.delete(:id)
         args[:not] ||= {}
         args[:milestone_title] ||= args.delete(:milestone)
-        args[:not][:milestone_title] ||= args[:not]&.delete(:milestone)
+        args[:milestone_wildcard_id] ||= args.delete(:milestone_id)
+        args[:not][:milestone_title] ||= args[:not].delete(:milestone)
+        args[:not][:milestone_wildcard_id] ||= args[:not].delete(:milestone_id)
         args[:label_name] ||= args.delete(:labels)
-        args[:not][:label_name] ||= args[:not]&.delete(:labels)
+        args[:not][:label_name] ||= args[:not].delete(:labels)
         args[:scope] = args[:scope].underscore if args[:scope]
         args[:sort] = "#{args[:order_by]}_#{args[:sort]}"
         args[:issue_types] ||= args.delete(:issue_type)
diff --git a/lib/api/helpers/members_helpers.rb b/lib/api/helpers/members_helpers.rb
index e72bbb931f0..1e89f9f97a2 100644
--- a/lib/api/helpers/members_helpers.rb
+++ b/lib/api/helpers/members_helpers.rb
@@ -50,24 +50,48 @@ module API
         GroupMembersFinder.new(group).execute
       end
 
-      def create_member(current_user, user, source, params)
-        source.add_user(user, params[:access_level], current_user: current_user, expires_at: params[:expires_at])
+      def present_members(members)
+        present members, with: Entities::Member, current_user: current_user, show_seat_info: params[:show_seat_info]
       end
 
-      def track_areas_of_focus(member, areas_of_focus)
-        return unless areas_of_focus
+      def present_member_invitations(invitations)
+        present invitations, with: Entities::Invitation, current_user: current_user
+      end
+
+      def add_single_member_by_user_id(create_service_params)
+        source = create_service_params[:source]
+        user_id = create_service_params[:user_ids]
+        user = User.find_by(id: user_id) # rubocop: disable CodeReuse/ActiveRecord
+
+        if user
+          conflict!('Member already exists') if member_already_exists?(source, user_id)
+
+          instance = ::Members::CreateService.new(current_user, create_service_params)
+          instance.execute
+
+          not_allowed! if instance.membership_locked # This currently can only be reached in EE if group membership is locked
 
-        areas_of_focus.each do |area_of_focus|
-          Gitlab::Tracking.event(::Members::CreateService.name, 'area_of_focus', label: area_of_focus, property: member.id.to_s)
+          member = instance.single_member
+          render_validation_error!(member) if member.invalid?
+
+          present_members(member)
+        else
+          not_found!('User')
         end
       end
 
-      def present_members(members)
-        present members, with: Entities::Member, current_user: current_user, show_seat_info: params[:show_seat_info]
+      def add_multiple_members?(user_id)
+        user_id.include?(',')
       end
 
-      def present_member_invitations(invitations)
-        present invitations, with: Entities::Invitation, current_user: current_user
+      def add_single_member?(user_id)
+        user_id.present?
+      end
+
+      private
+
+      def member_already_exists?(source, user_id)
+        source.members.exists?(user_id: user_id) # rubocop: disable CodeReuse/ActiveRecord
       end
     end
   end
diff --git a/lib/api/helpers/packages/npm.rb b/lib/api/helpers/packages/npm.rb
index ce5db52fdbc..34e126c73fc 100644
--- a/lib/api/helpers/packages/npm.rb
+++ b/lib/api/helpers/packages/npm.rb
@@ -57,7 +57,11 @@ module API
                                    .by_path(namespace_path)
               next unless namespace
 
-              finder = ::Packages::Npm::PackageFinder.new(package_name, namespace: namespace)
+              finder = ::Packages::Npm::PackageFinder.new(
+                package_name,
+                namespace: namespace,
+                last_of_each_version: false
+              )
 
               finder.last&.project_id
             end
diff --git a/lib/api/helpers/pagination_strategies.rb b/lib/api/helpers/pagination_strategies.rb
index 61cff37e4ab..8c2186768ea 100644
--- a/lib/api/helpers/pagination_strategies.rb
+++ b/lib/api/helpers/pagination_strategies.rb
@@ -3,10 +3,16 @@
 module API
   module Helpers
     module PaginationStrategies
-      def paginate_with_strategies(relation, request_scope)
+      def paginate_with_strategies(relation, request_scope = nil)
         paginator = paginator(relation, request_scope)
 
-        yield(paginator.paginate(relation)).tap do |records, _|
+        result = if block_given?
+                   yield(paginator.paginate(relation))
+                 else
+                   paginator.paginate(relation)
+                 end
+
+        result.tap do |records, _|
           paginator.finalize(records)
         end
       end
@@ -20,17 +26,31 @@ module API
       private
 
       def keyset_paginator(relation)
-        request_context = Gitlab::Pagination::Keyset::RequestContext.new(self)
-        unless Gitlab::Pagination::Keyset.available?(request_context, relation)
+        if cursor_based_keyset_pagination_supported?(relation)
+          request_context_class = Gitlab::Pagination::Keyset::CursorBasedRequestContext
+          paginator_class = Gitlab::Pagination::Keyset::CursorPager
+          availability_checker = Gitlab::Pagination::CursorBasedKeyset
+        else
+          request_context_class = Gitlab::Pagination::Keyset::RequestContext
+          paginator_class = Gitlab::Pagination::Keyset::Pager
+          availability_checker = Gitlab::Pagination::Keyset
+        end
+
+        request_context = request_context_class.new(self)
+
+        unless availability_checker.available?(request_context, relation)
           return error!('Keyset pagination is not yet available for this type of request', 405)
         end
 
-        Gitlab::Pagination::Keyset::Pager.new(request_context)
+        paginator_class.new(request_context)
       end
 
       def offset_paginator(relation, request_scope)
         offset_limit = limit_for_scope(request_scope)
-        if Gitlab::Pagination::Keyset.available_for_type?(relation) && offset_limit_exceeded?(offset_limit)
+        if (Gitlab::Pagination::Keyset.available_for_type?(relation) ||
+            cursor_based_keyset_pagination_supported?(relation)) &&
+            offset_limit_exceeded?(offset_limit)
+
           return error!("Offset pagination has a maximum allowed offset of #{offset_limit} " \
             "for requests that return objects of type #{relation.klass}. " \
             "Remaining records can be retrieved using keyset pagination.", 405)
@@ -39,6 +59,10 @@ module API
         Gitlab::Pagination::OffsetPagination.new(self)
       end
 
+      def cursor_based_keyset_pagination_supported?(relation)
+        Gitlab::Pagination::CursorBasedKeyset.available_for_type?(relation)
+      end
+
       def keyset_pagination_enabled?
         params[:pagination] == 'keyset'
       end
diff --git a/lib/api/helpers/settings_helpers.rb b/lib/api/helpers/settings_helpers.rb
index a3ea1057bc8..82de4917f0b 100644
--- a/lib/api/helpers/settings_helpers.rb
+++ b/lib/api/helpers/settings_helpers.rb
@@ -10,10 +10,18 @@ module API
       end
 
       def self.optional_attributes
-        [*::ApplicationSettingsHelper.visible_attributes,
-         *::ApplicationSettingsHelper.external_authorization_service_attributes,
-         *::ApplicationSettingsHelper.deprecated_attributes,
-         :performance_bar_allowed_group_id].freeze
+        [
+          *::ApplicationSettingsHelper.visible_attributes,
+          *::ApplicationSettingsHelper.external_authorization_service_attributes,
+          *::ApplicationSettingsHelper.deprecated_attributes,
+          :performance_bar_allowed_group_id,
+          # TODO: Once we rename these columns, we can remove them here and add the old
+          # names to `ApplicationSettingsHelper.deprecated_attributes` instead.
+          # https://gitlab.com/gitlab-org/gitlab/-/issues/340031
+          :throttle_unauthenticated_web_enabled,
+          :throttle_unauthenticated_web_period_in_seconds,
+          :throttle_unauthenticated_web_requests_per_period
+        ].freeze
       end
     end
   end