Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.rubocop_todo/rspec/missing_feature_category.yml

@@ -7019,7 +7019,6 @@ RSpec/MissingFeatureCategory:
     - 'spec/rubocop/cop/safe_params_spec.rb'
     - 'spec/rubocop/cop/scalability/bulk_perform_with_context_spec.rb'
     - 'spec/rubocop/cop/scalability/cron_worker_context_spec.rb'
-    - 'spec/rubocop/cop/scalability/file_uploads_spec.rb'
     - 'spec/rubocop/cop/scalability/idempotent_worker_spec.rb'
     - 'spec/rubocop/cop/sidekiq_api_usage_spec.rb'
     - 'spec/rubocop/cop/sidekiq_load_balancing/worker_data_consistency_spec.rb'

.rubocop_todo/style/arguments_forwarding.yml

@@ -106,7 +106,6 @@ Style/EmptyMethod:
     - 'ee/app/controllers/projects/security/sast_configuration_controller.rb'
     - 'ee/app/controllers/projects/settings/slacks_controller.rb'
     - 'ee/app/controllers/registrations/company_controller.rb'
-    - 'ee/app/controllers/registrations/verification_controller.rb'
     - 'ee/app/controllers/subscriptions/groups_controller.rb'
     - 'ee/app/controllers/trials_controller.rb'
     - 'ee/app/controllers/users/identity_verification_controller.rb'

.rubocop_todo/style/empty_method.yml

@@ -52,6 +52,7 @@ Style/MutableConstant:
     - 'rubocop/cop/scalability/idempotent_worker.rb'
     - 'rubocop/cop/sidekiq_load_balancing/worker_data_consistency.rb'
     - 'scripts/lib/glfm/constants.rb'
+    - 'scripts/lint-docs-blueprints.rb'
     - 'scripts/perf/gc/collect_gc_stats.rb'
     - 'spec/support/helpers/jira_integration_helpers.rb'
     - 'tooling/danger/stable_branch.rb'

.rubocop_todo/style/mutable_constant.yml

@@ -227,8 +227,8 @@ Style/RedundantFreeze:
     - 'rubocop/cop/inject_enterprise_edition_module.rb'
     - 'rubocop/cop/project_path_helper.rb'
     - 'rubocop/cop/qa/selector_usage.rb'
+    - 'scripts/lint-docs-blueprints.rb'
     - 'scripts/qa/testcases-check'
-    - 'scripts/review_apps/automated_cleanup.rb'
     - 'scripts/validate_migration_timestamps'
     - 'spec/contracts/provider/helpers/contract_source_helper.rb'
     - 'spec/initializers/secret_token_spec.rb'
@@ -240,4 +240,5 @@ Style/RedundantFreeze:
     - 'tooling/danger/datateam.rb'
     - 'tooling/danger/specs.rb'
     - 'tooling/danger/stable_branch.rb'
+    - 'tooling/lib/tooling/kubernetes_client.rb'
     - 'tooling/lib/tooling/mappings/view_to_js_mappings.rb'

.rubocop_todo/style/redundant_freeze.yml

@@ -1 +1 @@
-fe20fe12a1c82a668585e0181593f896b187ea36
+10880feb242899156d4a1d5224cb445f1ff6680c

GITALY_SERVER_VERSION

@@ -1 +1 @@
-4.0.0
+4.1.0

GITLAB_ELASTICSEARCH_INDEXER_VERSION

@@ -1,28 +1,23 @@
 <script>
-import {
-  GlAvatarLabeled,
-  GlDropdown,
-  GlDropdownItem,
-  GlDropdownText,
-  GlSearchBoxByType,
-} from '@gitlab/ui';
+import { GlAvatarLabeled, GlCollapsibleListbox } from '@gitlab/ui';
 import { debounce } from 'lodash';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import { s__ } from '~/locale';
 import { getProjects } from '~/rest_api';
 import { SEARCH_DELAY, GROUP_FILTERS } from '../constants';
 
+// We can have GlCollapsibleListbox dropdown panel with full
+// width once we implement
+// https://gitlab.com/gitlab-org/gitlab-ui/-/issues/2133
+// https://gitlab.com/gitlab-org/gitlab/-/issues/390411
 export default {
   name: 'ProjectSelect',
   components: {
     GlAvatarLabeled,
-    GlDropdown,
-    GlDropdownItem,
-    GlDropdownText,
-    GlSearchBoxByType,
+    GlCollapsibleListbox,
   },
   model: {
-    prop: 'selectedProject',
+    prop: 'selectedProjectId',
   },
   props: {
     groupsFilter: {
@@ -41,18 +36,21 @@ export default {
     return {
       isFetching: false,
       projects: [],
-      selectedProject: {},
+      selectedProjectId: '',
       searchTerm: '',
       errorMessage: '',
     };
   },
   computed: {
     selectedProjectName() {
-      return this.selectedProject.name || this.$options.i18n.dropdownText;
+      return this.selectedProject.nameWithNamespace || this.$options.i18n.dropdownText;
     },
     isFetchResultEmpty() {
       return this.projects.length === 0 && !this.isFetching;
     },
+    selectedProject() {
+      return this.projects.find((prj) => prj.id === this.selectedProjectId) || {};
+    },
   },
   watch: {
     searchTerm() {
@@ -70,10 +68,14 @@ export default {
         .then((response) => {
           this.projects = response.data.map((project) => ({
             ...convertObjectPropsToCamelCase(project),
-            name: project.name_with_namespace,
+            text: project.name_with_namespace,
+            value: project.id,
           }));
         })
         .catch(() => {
+          // To be displayed in GlCollapsibleListbox once we implement
+          // https://gitlab.com/gitlab-org/gitlab-ui/-/issues/2132
+          // https://gitlab.com/gitlab-org/gitlab/-/issues/389974
           this.errorMessage = this.$options.i18n.errorFetchingProjects;
         })
         .finally(() => {
@@ -83,9 +85,7 @@ export default {
     fetchProjects() {
       return getProjects(this.searchTerm, this.$options.defaultFetchOptions);
     },
-    selectProject(project) {
-      this.selectedProject = project;
-
+    selectProject() {
       this.$emit('input', this.selectedProject);
     },
   },
@@ -104,40 +104,28 @@ export default {
 };
 </script>
 <template>
-  <div>
-    <gl-dropdown
-      data-testid="project-select-dropdown"
-      :text="selectedProjectName"
-      toggle-class="gl-mb-2"
-      block
-      menu-class="gl-w-full!"
-    >
-      <gl-search-box-by-type
-        v-model="searchTerm"
-        :is-loading="isFetching"
-        :placeholder="$options.i18n.searchPlaceholder"
-        data-qa-selector="project_select_dropdown_search_field"
+  <gl-collapsible-listbox
+    v-model="selectedProjectId"
+    searchable
+    :items="projects"
+    :searching="isFetching"
+    :toggle-text="selectedProjectName"
+    :search-placeholder="$options.i18n.searchPlaceholder"
+    :no-results-text="$options.i18n.emptySearchResult"
+    data-testid="project-select-dropdown"
+    data-qa-selector="project_select_dropdown"
+    class="gl-collapsible-listbox-w-full"
+    @search="searchTerm = $event"
+    @select="selectProject"
+  >
+    <template #list-item="{ item }">
+      <gl-avatar-labeled
+        :label="item.text"
+        :src="item.avatarUrl"
+        :entity-id="item.id"
+        :entity-name="item.name"
+        :size="32"
       />
-      <gl-dropdown-item
-        v-for="project in projects"
-        :key="project.id"
-        :name="project.name"
-        @click="selectProject(project)"
-      >
-        <gl-avatar-labeled
-          :label="project.name"
-          :src="project.avatarUrl"
-          :entity-id="project.id"
-          :entity-name="project.name"
-          :size="32"
-        />
-      </gl-dropdown-item>
-      <gl-dropdown-text v-if="errorMessage" data-testid="error-message">
-        <span class="gl-text-gray-500">{{ errorMessage }}</span>
-      </gl-dropdown-text>
-      <gl-dropdown-text v-else-if="isFetchResultEmpty" data-testid="empty-result-message">
-        <span class="gl-text-gray-500">{{ $options.i18n.emptySearchResult }}</span>
-      </gl-dropdown-text>
-    </gl-dropdown>
-  </div>
+    </template>
+  </gl-collapsible-listbox>
 </template>

app/assets/javascripts/invite_members/components/project_select.vue

@@ -0,0 +1,25 @@
+#import "~/graphql_shared/fragments/user.fragment.graphql"
+#import "~/work_items/graphql/work_item_note.fragment.graphql"
+
+fragment WorkItemDiscussionNote on Note {
+  id
+  bodyHtml
+  system
+  internal
+  systemNoteIconName
+  createdAt
+  author {
+    ...User
+  }
+  userPermissions {
+    adminNote
+  }
+  discussion {
+    id
+    notes {
+      nodes {
+        ...WorkItemNote
+      }
+    }
+  }
+}

app/assets/javascripts/work_items/graphql/work_item_discussion_note.fragment.graphql

@@ -0,0 +1,7 @@
+#import "~/work_items/graphql/work_item_discussion_note.fragment.graphql"
+
+subscription workItemNoteCreated($noteableId: NoteableID) {
+  workItemNoteCreated(noteableId: $noteableId) {
+    ...WorkItemDiscussionNote
+  }
+}

app/assets/javascripts/work_items/graphql/work_item_note_created.subscription.graphql

@@ -0,0 +1,7 @@
+subscription workItemNoteDeleted($noteableId: NoteableID) {
+  workItemNoteDeleted(noteableId: $noteableId) {
+    id
+    discussionId
+    lastDiscussionNote
+  }
+}

app/assets/javascripts/work_items/graphql/work_item_note_deleted.subscription.graphql

@@ -0,0 +1,7 @@
+#import "~/work_items/graphql/work_item_note.fragment.graphql"
+
+subscription workItemNoteUpdated($noteableId: NoteableID) {
+  workItemNoteUpdated(noteableId: $noteableId) {
+    ...WorkItemNote
+  }
+}

app/assets/javascripts/work_items/graphql/work_item_note_updated.subscription.graphql

@@ -6,7 +6,7 @@ module MembershipActions
 
   def update
     update_params = params.require(root_params_key).permit(:access_level, :expires_at)
-    member = membershipable.members_and_requesters.find(params[:id])
+    member = members_and_requesters.find(params[:id])
     result = Members::UpdateService
       .new(current_user, update_params)
       .execute(member)
@@ -30,7 +30,7 @@ def update
   end
 
   def destroy
-    member = membershipable.members_and_requesters.find(params[:id])
+    member = members_and_requesters.find(params[:id])
     skip_subresources = !ActiveRecord::Type::Boolean.new.cast(params.delete(:remove_sub_memberships))
     # !! is used in case unassign_issuables contains empty string which would result in nil
     unassign_issuables = !!ActiveRecord::Type::Boolean.new.cast(params.delete(:unassign_issuables))
@@ -71,7 +71,7 @@ def request_access
   end
 
   def approve_access_request
-    access_requester = membershipable.requesters.find(params[:id])
+    access_requester = requesters.find(params[:id])
     Members::ApproveAccessRequestService
       .new(current_user, params)
       .execute(access_requester)
@@ -81,7 +81,7 @@ def approve_access_request
 
   # rubocop: disable CodeReuse/ActiveRecord
   def leave
-    member = membershipable.members_and_requesters.find_by!(user_id: current_user.id)
+    member = members_and_requesters.find_by!(user_id: current_user.id)
     Members::DestroyService.new(current_user).execute(member)
 
     notice =
@@ -140,6 +140,14 @@ def plain_source_type
     raise NotImplementedError
   end
 
+  def members_and_requesters
+    membershipable.members_and_requesters
+  end
+
+  def requesters
+    membershipable.requesters
+  end
+
   def requested_relations(inherited_permissions = :with_inherited_permissions)
     case params[inherited_permissions].presence
     when 'exclude'

app/controllers/concerns/membership_actions.rb

@@ -79,13 +79,7 @@ def create
   def realtime_changes
     Gitlab::PollingInterval.set_header(response, interval: 3_000)
 
-    render json: already_added_projects.map { |project|
-      {
-        id: project.id,
-        import_status: project.import_status,
-        stats: ::Gitlab::GithubImport::ObjectCounter.summary(project)
-      }
-    }
+    render json: Import::GithubRealtimeRepoSerializer.new.represent(already_added_projects)
   end
 
   def cancel

app/controllers/import/github_controller.rb

@@ -47,7 +47,7 @@ def filter_params
   end
 
   def membershipable_members
-    project.members
+    query_members_via_project_namespace_enabled? ? project.namespace_members : project.members
   end
 
   def plain_source_type
@@ -65,6 +65,18 @@ def members_page_url
   def root_params_key
     :project_member
   end
+
+  def members_and_requesters
+    query_members_via_project_namespace_enabled? ? project.namespace_members_and_requesters : super
+  end
+
+  def requesters
+    query_members_via_project_namespace_enabled? ? project.namespace_requesters : super
+  end
+
+  def query_members_via_project_namespace_enabled?
+    Feature.enabled?(:project_members_index_by_project_namespace, project)
+  end
 end
 
 Projects::ProjectMembersController.prepend_mod_with('Projects::ProjectMembersController')

app/controllers/projects/project_members_controller.rb

@@ -29,27 +29,33 @@ def self.issuable_milestone_updated(issuable)
     GitlabSchema.subscriptions.trigger('issuableMilestoneUpdated', { issuable_id: issuable.to_gid }, issuable)
   end
 
+  def self.work_item_note_created(work_item_gid, note_data)
+    GitlabSchema.subscriptions.trigger('workItemNoteCreated', { noteable_id: work_item_gid }, note_data)
+  end
+
+  def self.work_item_note_deleted(work_item_gid, note_data)
+    GitlabSchema.subscriptions.trigger('workItemNoteDeleted', { noteable_id: work_item_gid }, note_data)
+  end
+
+  def self.work_item_note_updated(work_item_gid, note_data)
+    GitlabSchema.subscriptions.trigger('workItemNoteUpdated', { noteable_id: work_item_gid }, note_data)
+  end
+
   def self.merge_request_reviewers_updated(merge_request)
     GitlabSchema.subscriptions.trigger(
-      'mergeRequestReviewersUpdated',
-      { issuable_id: merge_request.to_gid },
-      merge_request
+      'mergeRequestReviewersUpdated', { issuable_id: merge_request.to_gid }, merge_request
     )
   end
 
   def self.merge_request_merge_status_updated(merge_request)
     GitlabSchema.subscriptions.trigger(
-      'mergeRequestMergeStatusUpdated',
-      { issuable_id: merge_request.to_gid },
-      merge_request
+      'mergeRequestMergeStatusUpdated', { issuable_id: merge_request.to_gid }, merge_request
     )
   end
 
   def self.merge_request_approval_state_updated(merge_request)
     GitlabSchema.subscriptions.trigger(
-      'mergeRequestApprovalStateUpdated',
-      { issuable_id: merge_request.to_gid },
-      merge_request
+      'mergeRequestApprovalStateUpdated', { issuable_id: merge_request.to_gid }, merge_request
     )
   end
 end