Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/ci/test-on-gdk/main.gitlab-ci.yml

@@ -37,6 +37,10 @@ include:
     - if: $QA_SUITES =~ /Test::Instance::Smoke/
     - !reference [.rules:test:manual, rules]
 
+.parallel:
+  variables:
+    QA_TESTS: "" # Reset to empty, because parallel run should never pass in specific specs
+
 .gdk-qa-base:
   image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/debian-${DEBIAN_VERSION}-ruby-${RUBY_VERSION}:bundler-2.3-git-2.36-lfs-2.9-chrome-${CHROME_VERSION}-docker-${DOCKER_VERSION}-gcloud-383-kubectl-1.23
   extends:

app/assets/javascripts/performance_bar/components/detailed_metric.vue

@@ -141,7 +141,7 @@ export default {
     v-if="currentRequest.details && metricDetails"
     :id="`peek-view-${metric}`"
     class="gl-display-flex gl-align-items-baseline view"
-    data-qa-selector="detailed_metric_content"
+    data-testid="detailed-metric-content"
   >
     <gl-button
       v-gl-tooltip.viewport

app/assets/javascripts/performance_bar/components/performance_bar_app.vue

@@ -175,7 +175,7 @@ export default {
     <div
       v-if="currentRequest"
       class="gl-display-flex container-fluid gl-overflow-x-auto"
-      data-qa-selector="performance_bar"
+      data-testid="performance-bar"
     >
       <div class="gl-display-flex gl-flex-shrink-0 view-performance-container">
         <div v-if="hasHost" id="peek-view-host" class="gl-display-flex gl-gap-2 view">

app/assets/javascripts/performance_bar/components/request_selector.vue

@@ -28,13 +28,13 @@ export default {
 };
 </script>
 <template>
-  <div id="peek-request-selector" data-qa-selector="request_dropdown" class="view gl-mr-5">
+  <div id="peek-request-selector" data-testid="request-dropdown" class="view gl-mr-5">
     <gl-form-select v-model="currentRequestId" class="gl-px-3! gl-py-2!">
       <option
         v-for="request in requests"
         :key="request.id"
         :value="request.id"
-        data-qa-selector="request_dropdown_option"
+        data-testid="request-dropdown-option"
       >
         {{ request.displayName }}
       </option>

app/graphql/mutations/organizations/create.rb

@@ -20,16 +20,29 @@ class Create < BaseMutation
         required: true,
         description: 'Path for the organization.'
 
+      argument :description, GraphQL::Types::String,
+        required: false,
+        description: 'Description of the organization.'
+
       def resolve(args)
         authorize!(:global)
 
         result = ::Organizations::CreateService.new(
           current_user: current_user,
-          params: args
+          params: create_params(args)
         ).execute
 
         { organization: result.payload, errors: result.errors }
       end
+
+      private
+
+      def create_params(params)
+        return params unless params.key?(:description)
+
+        params[:organization_detail_attributes] = { description: params.delete(:description) }
+        params
+      end
     end
   end
 end

app/graphql/types/organizations/organization_type.rb

@@ -17,9 +17,7 @@ class OrganizationType < BaseObject
       field :description,
         GraphQL::Types::String,
         null: true,
-        description:
-          'Description of the organization. `null` until ' \
-          '[#422078](https://gitlab.com/gitlab-org/gitlab/-/issues/422078) is complete.',
+        description: 'Description of the organization.',
         alpha: { milestone: '16.7' }
       field :groups,
         Types::GroupType.connection_type,
@@ -47,14 +45,13 @@ class OrganizationType < BaseObject
         null: false,
         description: 'Path of the organization.',
         alpha: { milestone: '16.4' }
-      field :web_url, GraphQL::Types::String,
+      field :web_url,
+        GraphQL::Types::String,
         null: false,
         description: 'Web URL of the organization.',
         alpha: { milestone: '16.6' }
 
-      # Returns empty string until https://gitlab.com/gitlab-org/gitlab/-/issues/422078 is complete.
-      markdown_field :description_html,
-        null: true
+      markdown_field :description_html, null: true, alpha: { milestone: '16.7' }, &:organization_detail
 
       # TODO - update to return real avatar url when https://gitlab.com/gitlab-org/gitlab/-/issues/422418 is complete.
       def avatar_url

app/models/organizations/organization.rb

@@ -13,6 +13,7 @@ class Organization < ApplicationRecord
     has_many :projects
 
     has_one :settings, class_name: "OrganizationSetting"
+    has_one :organization_detail, inverse_of: :organization, autosave: true
 
     has_many :organization_users, inverse_of: :organization
     has_many :users, through: :organization_users, inverse_of: :organizations
@@ -26,10 +27,18 @@ class Organization < ApplicationRecord
       'organizations/path': true,
       length: { minimum: 2, maximum: 255 }
 
+    delegate :description, to: :organization_detail
+
+    accepts_nested_attributes_for :organization_detail
+
     def self.default_organization
       find_by(id: DEFAULT_ORGANIZATION_ID)
     end
 
+    def organization_detail
+      super.presence || build_organization_detail
+    end
+
     def default?
       id == DEFAULT_ORGANIZATION_ID
     end
@@ -46,11 +55,6 @@ def web_url(only_path: nil)
       Gitlab::UrlBuilder.build(self, only_path: only_path)
     end
 
-    # TODO - update to return real description when https://gitlab.com/gitlab-org/gitlab/-/issues/422078 is complete.
-    def description
-      nil
-    end
-
     private
 
     def check_if_default_organization

app/models/organizations/organization_detail.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Organizations
+  class OrganizationDetail < ApplicationRecord
+    include CacheMarkdownField
+
+    cache_markdown_field :description
+
+    belongs_to :organization, inverse_of: :organization_detail
+
+    validates :organization, presence: true
+    validates :description, length: { maximum: 1024 }
+  end
+end

config/feature_flags/development/use_500_page_size_for_contribution_analytics.yml

@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/431595
 milestone: '16.7'
 type: development
 group: group::optimize
-default_enabled: false
+default_enabled: true

db/docs/organization_details.yml

@@ -0,0 +1,10 @@
+---
+table_name: organization_details
+classes:
+- Organizations::OrganizationDetail
+feature_categories:
+- cell
+description: Detail about an organization
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137616
+milestone: '16.7'
+gitlab_schema: gitlab_main_clusterwide

db/migrate/20231117031416_add_web_ide_oauth_application_to_settings.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddWebIdeOauthApplicationToSettings < Gitlab::Database::Migration[2.2]
+  milestone '16.7'
+
+  def change
+    add_column :application_settings, :web_ide_oauth_application_id, :int, null: true
+  end
+end

db/migrate/20231117031559_add_fk_web_ide_oauth_application.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class AddFkWebIdeOauthApplication < Gitlab::Database::Migration[2.2]
+  milestone '16.7'
+  disable_ddl_transaction!
+
+  INDEX_NAME = 'index_application_settings_web_ide_oauth_application_id'
+
+  def up
+    add_concurrent_index :application_settings, :web_ide_oauth_application_id, name: INDEX_NAME
+    add_concurrent_foreign_key :application_settings, :oauth_applications,
+      column: :web_ide_oauth_application_id,
+      on_delete: :nullify
+  end
+
+  def down
+    with_lock_retries do
+      remove_foreign_key :application_settings, column: :web_ide_oauth_application_id
+    end
+    remove_concurrent_index_by_name :application_settings, INDEX_NAME
+  end
+end

db/migrate/20231120090305_create_organization_details.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class CreateOrganizationDetails < Gitlab::Database::Migration[2.2]
+  enable_lock_retries!
+  milestone '16.7'
+
+  def change
+    create_table :organization_details, id: false do |t|
+      t.references :organization, primary_key: true, default: nil, index: false, foreign_key: { on_delete: :cascade }
+      t.timestamps_with_timezone null: false
+      t.integer :cached_markdown_version
+      t.text :description, limit: 1024
+      t.text :description_html # rubocop:disable Migration/AddLimitToTextColumns -- It will be limited by description
+    end
+  end
+end

db/schema_migrations/20231117031416

@@ -0,0 +1 @@
+f9d770cc47aa6a7ec1ff0e2f70ee7fbc6f1071e159fd8f722959730222dbf6eb

db/schema_migrations/20231117031559

@@ -0,0 +1 @@
+57c6bd774242b5fd6383bd393dfc90007f5f7fef21f2c83d3252f19cd1518e78

db/schema_migrations/20231120090305

@@ -0,0 +1 @@
+4e1cbdfdfd8aef13db978cb98ce925c7832567fdef1ca8ceb17038ca2a9c921c

db/structure.sql

@@ -12202,6 +12202,7 @@ CREATE TABLE application_settings (
     update_namespace_name_rate_limit smallint DEFAULT 120 NOT NULL,
     pre_receive_secret_detection_enabled boolean DEFAULT false NOT NULL,
     can_create_organization boolean DEFAULT true NOT NULL,
+    web_ide_oauth_application_id integer,
     CONSTRAINT app_settings_container_reg_cleanup_tags_max_list_size_positive CHECK ((container_registry_cleanup_tags_service_max_list_size >= 0)),
     CONSTRAINT app_settings_container_registry_pre_import_tags_rate_positive CHECK ((container_registry_pre_import_tags_rate >= (0)::numeric)),
     CONSTRAINT app_settings_dep_proxy_ttl_policies_worker_capacity_positive CHECK ((dependency_proxy_ttl_group_policy_worker_capacity >= 0)),
@@ -19955,6 +19956,16 @@ CREATE SEQUENCE operations_user_lists_id_seq
 
 ALTER SEQUENCE operations_user_lists_id_seq OWNED BY operations_user_lists.id;
 
+CREATE TABLE organization_details (
+    organization_id bigint NOT NULL,
+    created_at timestamp with time zone NOT NULL,
+    updated_at timestamp with time zone NOT NULL,
+    cached_markdown_version integer,
+    description text,
+    description_html text,
+    CONSTRAINT check_71dfb7807f CHECK ((char_length(description) <= 1024))
+);
+
 CREATE TABLE organization_settings (
     organization_id bigint NOT NULL,
     created_at timestamp with time zone NOT NULL,
@@ -29188,6 +29199,9 @@ ALTER TABLE ONLY operations_strategies_user_lists
 ALTER TABLE ONLY operations_user_lists
     ADD CONSTRAINT operations_user_lists_pkey PRIMARY KEY (id);
 
+ALTER TABLE ONLY organization_details
+    ADD CONSTRAINT organization_details_pkey PRIMARY KEY (organization_id);
+
 ALTER TABLE ONLY organization_settings
     ADD CONSTRAINT organization_settings_pkey PRIMARY KEY (organization_id);
 
@@ -31661,6 +31675,8 @@ CREATE UNIQUE INDEX index_application_settings_on_push_rule_id ON application_se
 
 CREATE INDEX index_application_settings_on_usage_stats_set_by_user_id ON application_settings USING btree (usage_stats_set_by_user_id);
 
+CREATE INDEX index_application_settings_web_ide_oauth_application_id ON application_settings USING btree (web_ide_oauth_application_id);
+
 CREATE INDEX index_applicationsettings_on_instance_administration_project_id ON application_settings USING btree (instance_administration_project_id);
 
 CREATE INDEX index_approval_group_rules_groups_on_group_id ON approval_group_rules_groups USING btree (group_id);
@@ -38157,6 +38173,9 @@ ALTER TABLE ONLY cluster_agents
 ALTER TABLE ONLY protected_tag_create_access_levels
     ADD CONSTRAINT fk_f7dfda8c51 FOREIGN KEY (protected_tag_id) REFERENCES protected_tags(id) ON DELETE CASCADE;
 
+ALTER TABLE ONLY application_settings
+    ADD CONSTRAINT fk_f9867b3540 FOREIGN KEY (web_ide_oauth_application_id) REFERENCES oauth_applications(id) ON DELETE SET NULL;
+
 ALTER TABLE ONLY ci_stages
     ADD CONSTRAINT fk_fb57e6cc56 FOREIGN KEY (pipeline_id) REFERENCES ci_pipelines(id) ON DELETE CASCADE;
 
@@ -39201,6 +39220,9 @@ ALTER TABLE ONLY alert_management_alert_user_mentions
 ALTER TABLE ONLY project_daily_statistics
     ADD CONSTRAINT fk_rails_8e549b272d FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;
 
+ALTER TABLE ONLY organization_details
+    ADD CONSTRAINT fk_rails_8facb04bef FOREIGN KEY (organization_id) REFERENCES organizations(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY ci_pipelines_config
     ADD CONSTRAINT fk_rails_906c9a2533 FOREIGN KEY (pipeline_id) REFERENCES ci_pipelines(id) ON DELETE CASCADE;
 

doc/api/graphql/reference/index.md

@@ -5756,6 +5756,7 @@ Input type: `OrganizationCreateInput`
 | Name | Type | Description |
 | ---- | ---- | ----------- |
 | <a id="mutationorganizationcreateclientmutationid"></a>`clientMutationId` | [`String`](#string) | A unique identifier for the client performing the mutation. |
+| <a id="mutationorganizationcreatedescription"></a>`description` | [`String`](#string) | Description of the organization. |
 | <a id="mutationorganizationcreatename"></a>`name` | [`String!`](#string) | Name for the organization. |
 | <a id="mutationorganizationcreatepath"></a>`path` | [`String!`](#string) | Path for the organization. |
 
@@ -22833,8 +22834,8 @@ Active period time range for on-call rotation.
 | Name | Type | Description |
 | ---- | ---- | ----------- |
 | <a id="organizationavatarurl"></a>`avatarUrl` **{warning-solid}** | [`String`](#string) | **Introduced** in 16.7. This feature is an Experiment. It can be changed or removed at any time. Avatar URL of the organization. `null` until [#422418](https://gitlab.com/gitlab-org/gitlab/-/issues/422418) is complete. |
-| <a id="organizationdescription"></a>`description` **{warning-solid}** | [`String`](#string) | **Introduced** in 16.7. This feature is an Experiment. It can be changed or removed at any time. Description of the organization. `null` until [#422078](https://gitlab.com/gitlab-org/gitlab/-/issues/422078) is complete. |
-| <a id="organizationdescriptionhtml"></a>`descriptionHtml` | [`String`](#string) | GitLab Flavored Markdown rendering of `description`. |
+| <a id="organizationdescription"></a>`description` **{warning-solid}** | [`String`](#string) | **Introduced** in 16.7. This feature is an Experiment. It can be changed or removed at any time. Description of the organization. |
+| <a id="organizationdescriptionhtml"></a>`descriptionHtml` **{warning-solid}** | [`String`](#string) | **Introduced** in 16.7. This feature is an Experiment. It can be changed or removed at any time. GitLab Flavored Markdown rendering of `description`. |
 | <a id="organizationid"></a>`id` **{warning-solid}** | [`ID!`](#id) | **Introduced** in 16.4. This feature is an Experiment. It can be changed or removed at any time. ID of the organization. |
 | <a id="organizationname"></a>`name` **{warning-solid}** | [`String!`](#string) | **Introduced** in 16.4. This feature is an Experiment. It can be changed or removed at any time. Name of the organization. |
 | <a id="organizationorganizationusers"></a>`organizationUsers` **{warning-solid}** | [`OrganizationUserConnection!`](#organizationuserconnection) | **Introduced** in 16.4. This feature is an Experiment. It can be changed or removed at any time. Users with access to the organization. |

doc/api/projects.md

@@ -280,6 +280,9 @@ When the user is authenticated and `simple` is not set this returns something li
 ]
 ```
 
+NOTE:
+`last_activity_at` is updated based on [project activity](../user/project/working_with_projects.md#view-project-activity) and [project events](events.md). `updated_at` is updated whenever the project record is changed in the database.
+
 You can filter by [custom attributes](custom_attributes.md) with:
 
 ```plaintext

doc/development/ai_features/duo_chat.md

@@ -14,7 +14,7 @@ Use [this snippet](https://gitlab.com/gitlab-org/gitlab/-/snippets/2554994) for
 1. [Enable Anthropic API features](index.md#configure-anthropic-access).
 1. [Ensure the embedding database is configured](index.md#set-up-the-embedding-database).
 1. Ensure that your current branch is up-to-date with `master`.
-1. To access the GitLab Duo Chat interface, in the lower-left corner of any page, select **Help** and **Ask GitLab Duo Chat**.
+1. Enable the feature in Rails console: `Feature.enable(:tanuki_bot_breadcrumbs_entry_point)`
 
 ## Working with GitLab Duo Chat
 
@@ -85,7 +85,7 @@ gdk start
 tail -f log/llm.log
 ```
 
-## Testing GitLab Duo Chat against real LLMs
+## Testing GitLab Duo Chat against real LLMs locally
 
 Because success of answers to user questions in GitLab Duo Chat heavily depends
 on toolchain and prompts of each tool, it's common that even a minor change in a
@@ -145,3 +145,14 @@ We therefore need to broadcast messages to multiple clients to keep them in sync
 
 Note that we still broadcast chat messages and currently used tools using the `userId` and `resourceId` as identifier.
 However, this is deprecated and should no longer be used. We want to remove `resourceId` on the subscription as part of [this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/420296).
+
+## Testing GitLab Duo Chat in production-like environments
+
+GitLab Duo Chat is enabled in the [Staging](https://staging.gitlab.com) and
+[Staging Ref](https://staging-ref.gitlab.com/) GitLab environments.
+
+Because GitLab Duo Chat is currently only available to members of groups in the
+Ultimate tier, Staging Ref may be an easier place to test changes as a GitLab
+team member because
+[you can make yourself an instance Admin in Staging Ref](https://about.gitlab.com/handbook/engineering/infrastructure/environments/staging-ref/#admin-access)
+and, as an Admin, easily create licensed groups for testing.

doc/development/database/query_recorder.md

@@ -17,8 +17,8 @@ As a rule, merge requests [should not increase query counts](../merge_request_co
 This style of test works by counting the number of SQL queries executed by ActiveRecord. First a control count is taken, then you add new records to the database and rerun the count. If the number of queries has significantly increased then an `N+1` queries problem exists.
 
 ```ruby
-it "avoids N+1 database queries" do
-  control = ActiveRecord::QueryRecorder.new { visit_some_page }
+it "avoids N+1 database queries", :use_sql_query_cache do
+  control = ActiveRecord::QueryRecorder.new(skip_cached: false) { visit_some_page }
   create_list(:issue, 5)
   expect { visit_some_page }.to issue_same_number_of_queries_as(control)
 end

doc/user/project/import/bitbucket_server.md

@@ -75,6 +75,8 @@ The following items are changed when they are imported:
 
 ## User assignment
 
+> Importing approvals by email address or username [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/23586) in GitLab 16.7.
+
 Prerequisites:
 
 - Authentication token with administrator access.
@@ -87,8 +89,10 @@ original creator.
 The importer creates any new namespaces (groups) if they don't exist. If the namespace is taken, the
 repository imports under the namespace of the user who started the import process.
 
-The importer attempts to find reviewers by their email address in the GitLab user database. If they don't exist in GitLab, they cannot be added as reviewers to a
-merge request.
+The importer attempts to find:
+
+- Reviewers by their email address in the GitLab user database. If they don't exist in GitLab, they are not added as reviewers to a merge request.
+- Approvers by username or email. If they don't exist in GitLab, the approval is not added to a merge request.
 
 ### User assignment by username