Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.rubocop.yml

@@ -538,6 +538,7 @@ Gitlab/RSpec/AvoidSetup:
     - 'ee/spec/features/registrations/saas/**/*'
     - 'ee/spec/features/trials/saas/**/*'
     - 'ee/spec/features/gitlab_subscriptions/trials/duo_pro/**/*'
+    - 'ee/spec/features/gitlab_subscriptions/trials/duo_enterprise/**/*'
 
 RSpec/DuplicateSpecLocation:
   Enabled: true

.rubocop_todo/layout/line_end_string_concatenation_indentation.yml

@@ -134,7 +134,6 @@ Layout/LineEndStringConcatenationIndentation:
     - 'ee/app/components/namespaces/storage/user_pre_enforcement_alert_component.rb'
     - 'ee/app/controllers/concerns/insights_actions.rb'
     - 'ee/app/controllers/ee/ldap/omniauth_callbacks_controller.rb'
-    - 'ee/app/controllers/gitlab_subscriptions/trials/duo_pro_controller.rb'
     - 'ee/app/finders/geo/framework_registry_finder.rb'
     - 'ee/app/graphql/ee/mutations/ci/project_ci_cd_settings_update.rb'
     - 'ee/app/graphql/ee/mutations/issues/create.rb'

.rubocop_todo/rails/strong_params.yml

@@ -335,7 +335,6 @@ Rails/StrongParams:
     - 'ee/app/controllers/smartcard_controller.rb'
     - 'ee/app/controllers/subscriptions/groups_controller.rb'
     - 'ee/app/controllers/subscriptions/hand_raise_leads_controller.rb'
-    - 'ee/app/controllers/gitlab_subscriptions/trials/duo_pro_controller.rb'
     - 'ee/app/controllers/subscriptions/trials_controller.rb'
     - 'ee/app/controllers/subscriptions_controller.rb'
     - 'ee/app/controllers/users/base_identity_verification_controller.rb'

Gemfile

@@ -626,7 +626,7 @@ gem 'ssh_data', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory
 gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
 
 # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 17.2.0', feature_category: :gitaly
+gem 'gitaly', '~> 17.4.0.pre.rc1', feature_category: :gitaly
 
 # KAS GRPC protocol definitions
 gem 'gitlab-kas-grpc', '~> 17.4.0.pre.rc1', feature_category: :deployment_management

Gemfile.checksum

@@ -207,7 +207,7 @@
 {"name":"gettext","version":"3.4.9","platform":"ruby","checksum":"292864fe6a15c224cee4125a4a72fab426fdbb280e4cff3cfe44935f549b009a"},
 {"name":"gettext_i18n_rails","version":"1.12.0","platform":"ruby","checksum":"6ac4817731a9e2ce47e1e83381ac34f9142263bc2911aaaafb2526d2f1afc1be"},
 {"name":"git","version":"1.18.0","platform":"ruby","checksum":"c9b80462e4565cd3d7a9ba8440c41d2c52244b17b0dad0bfddb46de70630c465"},
-{"name":"gitaly","version":"17.2.0","platform":"ruby","checksum":"48eee8883c43bb2f8fedbb43e4543439cfe37c33becebaec9ea1d425f9cce865"},
+{"name":"gitaly","version":"17.4.0.pre.rc1","platform":"ruby","checksum":"72c69dfa77871be78dd2e017be3131b9515b396d779df5785f77df291219f7b3"},
 {"name":"gitlab","version":"4.19.0","platform":"ruby","checksum":"3f645e3e195dbc24f0834fbf83e8ccfb2056d8e9712b01a640aad418a6949679"},
 {"name":"gitlab-chronic","version":"0.10.5","platform":"ruby","checksum":"f80f18dc699b708870a80685243331290bc10cfeedb6b99c92219722f729c875"},
 {"name":"gitlab-dangerfiles","version":"4.8.0","platform":"ruby","checksum":"b327d079552ec974a63bf34d749a0308425af6ebf51d01064f1a6ff216a523db"},

Gemfile.lock

@@ -701,7 +701,7 @@ GEM
     git (1.18.0)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    gitaly (17.2.0)
+    gitaly (17.4.0.pre.rc1)
       grpc (~> 1.0)
     gitlab (4.19.0)
       httparty (~> 0.20)
@@ -2053,7 +2053,7 @@ DEPENDENCIES
   gdk-toogle (~> 0.9, >= 0.9.5)
   gettext (~> 3.4, >= 3.4.9)
   gettext_i18n_rails (~> 1.12.0)
-  gitaly (~> 17.2.0)
+  gitaly (~> 17.4.0.pre.rc1)
   gitlab-backup-cli!
   gitlab-chronic (~> 0.10.5)
   gitlab-dangerfiles (~> 4.8.0)

app/assets/javascripts/editor/schema/ci.json

@@ -259,6 +259,10 @@
           "markdownDescription": "Reports will be uploaded as artifacts, and often displayed in the Gitlab UI, such as in merge requests. [Learn More](https://docs.gitlab.com/ee/ci/yaml/#artifactsreports).",
           "additionalProperties": false,
           "properties": {
+            "annotations": {
+              "type": "string",
+              "description": "Path to JSON file with annotations report."
+            },
             "junit": {
               "description": "Path for file(s) that should be parsed as JUnit XML result",
               "oneOf": [

app/controllers/users_controller.rb

@@ -186,7 +186,7 @@ def calendar_activities
 
   def exists
     if Gitlab::CurrentSettings.signup_enabled? || current_user
-      render json: { exists: !!Namespace.without_project_namespaces.find_by_path_or_name(params[:username]) }
+      render json: { exists: Namespace.username_reserved?(params[:username]) }
     else
       render json: { error: _('You must be authenticated to access this path.') }, status: :unauthorized
     end

app/finders/concerns/namespaces/groups_filter.rb

@@ -37,5 +37,10 @@ def by_min_access_level(groups)
 
       groups.by_min_access_level(current_user, params[:min_access_level])
     end
+
+    def filter_groups(groups)
+      by_search(groups)
+      .then { |filtered_groups| by_min_access_level(filtered_groups) }
+    end
   end
 end

app/finders/namespaces/groups/invited_groups_finder.rb

@@ -7,7 +7,7 @@
 #   group
 #   current_user
 #   params:
-#     relations: string
+#     relation: string - groups by relation (direct or inherited)
 #     search: string
 #     min_access_level: integer
 #
@@ -18,8 +18,6 @@ class InvitedGroupsFinder
       include Namespaces::GroupsFilter
       include Gitlab::Allowable
 
-      attr_reader :group, :current_user, :params
-
       def initialize(group, current_user = nil, params = {})
         @group = group
         @current_user = current_user
@@ -31,19 +29,16 @@ def execute
 
         group_links = group_group_links(group, include_relations)
         groups = Group.id_in(group_links.select(:shared_with_group_id)).public_or_visible_to_user(current_user)
-        groups = filter_invited_groups(groups)
+        groups = filter_groups(groups)
         sort(groups).with_route
       end
 
       private
 
-      def filter_invited_groups(groups)
-        by_search(groups)
-        .then { |filtered_groups| by_min_access_level(filtered_groups) }
-      end
+      attr_reader :group, :current_user, :params
 
       def include_relations
-        [params[:relation].try(:to_sym)]
+        Array(params[:relation]).map(&:to_sym)
       end
     end
   end