Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

app/assets/javascripts/pages/projects/forks/new/components/fork_form.vue

@@ -283,10 +283,11 @@ export default {
         redirectTo(data.web_url); // eslint-disable-line import/no-deprecated
       } catch (error) {
         this.isSaving = false;
+        const message =
+          error?.response?.data?.message?.join('. ') ||
+          s__('ForkProject|An error occurred while forking the project. Please try again.');
         createAlert({
-          message: s__(
-            'ForkProject|An error occurred while forking the project. Please try again.',
-          ),
+          message,
         });
       }
     },

app/models/project.rb

@@ -2318,7 +2318,13 @@ def pipeline_status
   def add_export_job(current_user:, after_export_strategy: nil, params: {})
     check_project_export_limit!
 
-    job_id = ProjectExportWorker.perform_async(current_user.id, self.id, after_export_strategy, params)
+    job_id = if Feature.enabled?(:parallel_project_export, current_user)
+               Projects::ImportExport::CreateRelationExportsWorker
+                 .perform_async(current_user.id, self.id, after_export_strategy, params)
+             else
+               ProjectExportWorker
+                 .perform_async(current_user.id, self.id, after_export_strategy, params)
+             end
 
     if job_id
       Gitlab::AppLogger.info "Export job started for project ID #{self.id} with job ID #{job_id}"

app/workers/projects/import_export/create_relation_exports_worker.rb

@@ -33,14 +33,14 @@ def perform(user_id, project_id, after_export_strategy = {}, params = {})
           RelationExportWorker.with_status.perform_async(relation_export.id, user_id, params)
         end
 
+        project_export_job.start!
+
         WaitRelationExportsWorker.perform_in(
           INITIAL_DELAY,
           project_export_job.id,
           user_id,
           after_export_strategy
         )
-
-        project_export_job.start!
       end
       # rubocop: enable CodeReuse/ActiveRecord
     end

config/feature_flags/development/parallel_project_export.yml

@@ -0,0 +1,8 @@
+---
+name: parallel_project_export
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/145165
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/442337
+milestone: '16.10'
+type: development
+group: group::import and integrate
+default_enabled: false

config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml

@@ -5,7 +5,7 @@ description: Count of projects using `AWS/CF-Provision-and-Deploy-EC2.gitlab-ci.
   template in last 7 days.
 product_section: ops
 product_stage: release
-product_group: delivery
+product_group: environments
 value_type: number
 status: removed
 milestone_removed: '14.6'

config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml

@@ -5,7 +5,7 @@ description: Count of projects using `AWS/Deploy-ECS.gitlab-ci.yml` template in
   7 days.
 product_section: ops
 product_stage: release
-product_group: delivery
+product_group: environments
 value_type: number
 status: active
 time_frame: 7d

config/metrics/counts_7d/20211015154445_p_ci_templates_kaniko_weekly.yml

@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_kaniko_weekly
 description: ''
 product_section: ops
 product_stage: release
-product_group: delivery
+product_group: environments
 value_type: number
 status: active
 milestone: '14.5'

config/metrics/counts_7d/20220202160120_ci_users_executing_deployment_job_weekly.yml

@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_users.ci_users_executing_deployment_job_weekly
 description: Weekly counts of times users have executed deployment jobs
 product_section: ops
 product_stage: release
-product_group: delivery
+product_group: environments
 value_type: number
 status: active
 milestone: "14.8"

config/metrics/counts_7d/20220706175117_ci_users_executing_verify_job_weekly.yml

@@ -3,7 +3,7 @@ key_path: redis_hll_counters.ci_users.ci_users_executing_verify_environment_job_
 description: Weekly counts of times users have executed verify jobs
 product_section: ops
 product_stage: release
-product_group: delivery
+product_group: environments
 value_type: number
 status: active
 milestone: "15.2"

db/docs/deleted_tables/user_interacted_projects.yml renamed to db/docs/user_interacted_projects.yml

@@ -16,5 +16,3 @@ allow_cross_foreign_keys:
 - gitlab_main_clusterwide
 sharding_key:
   project_id: projects
-removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139630
-removed_in_milestone: '16.10'

db/post_migrate/20240212200632_remove_foreign_keys_user_interacted_projects.rb

@@ -3,28 +3,11 @@
 class RemoveForeignKeysUserInteractedProjects < Gitlab::Database::Migration[2.2]
   milestone '16.10'
 
-  disable_ddl_transaction!
-
-  FOREIGN_KEY_NAME_USERS = "fk_0894651f08"
-  FOREIGN_KEY_NAME_PROJECTS = "fk_722ceba4f7"
-
   def up
-    with_lock_retries do
-      remove_foreign_key_if_exists(:user_interacted_projects, :users,
-        name: FOREIGN_KEY_NAME_USERS, reverse_lock_order: true)
-
-      remove_foreign_key_if_exists(:user_interacted_projects, :projects,
-        name: FOREIGN_KEY_NAME_PROJECTS, reverse_lock_order: true)
-    end
+    # No-op https://gitlab.com/gitlab-com/gl-infra/production/-/issues/17622
   end
 
   def down
-    add_concurrent_foreign_key(:user_interacted_projects, :users,
-      name: FOREIGN_KEY_NAME_USERS, column: :user_id,
-      target_column: :id, on_delete: :cascade)
-
-    add_concurrent_foreign_key(:user_interacted_projects, :projects,
-      name: FOREIGN_KEY_NAME_PROJECTS, column: :project_id,
-      target_column: :id, on_delete: :cascade)
+    # No-op https://gitlab.com/gitlab-com/gl-infra/production/-/issues/17622
   end
 end

db/post_migrate/20240212200947_drop_user_interacted_projects_table.rb

@@ -3,25 +3,11 @@
 class DropUserInteractedProjectsTable < Gitlab::Database::Migration[2.2]
   milestone '16.10'
 
-  disable_ddl_transaction!
-
-  TABLE_NAME = 'user_interacted_projects'
-  INDEX_NAME = 'index_user_interacted_projects_on_user_id'
-  PRIMARY_KEY_CONSTRAINT = 'user_interacted_projects_pkey'
-
   def up
-    drop_table :user_interacted_projects
+    # No-op https://gitlab.com/gitlab-com/gl-infra/production/-/issues/17622
   end
 
   def down
-    unless table_exists?(:user_interacted_projects)
-      create_table :user_interacted_projects, id: false do |t|
-        t.integer :user_id, null: false
-        t.integer :project_id, null: false
-        t.index :user_id, name: INDEX_NAME
-      end
-    end
-
-    execute "ALTER TABLE #{TABLE_NAME} ADD CONSTRAINT #{PRIMARY_KEY_CONSTRAINT} PRIMARY KEY (project_id, user_id)"
+    # No-op https://gitlab.com/gitlab-com/gl-infra/production/-/issues/17622
   end
 end

db/structure.sql

@@ -16626,6 +16626,11 @@ CREATE TABLE user_highest_roles (
     highest_access_level integer
 );
 
+CREATE TABLE user_interacted_projects (
+    user_id integer NOT NULL,
+    project_id integer NOT NULL
+);
+
 CREATE TABLE user_namespace_callouts (
     id bigint NOT NULL,
     user_id bigint NOT NULL,
@@ -22001,6 +22006,9 @@ ALTER TABLE ONLY user_group_callouts
 ALTER TABLE ONLY user_highest_roles
     ADD CONSTRAINT user_highest_roles_pkey PRIMARY KEY (user_id);
 
+ALTER TABLE ONLY user_interacted_projects
+    ADD CONSTRAINT user_interacted_projects_pkey PRIMARY KEY (project_id, user_id);
+
 ALTER TABLE ONLY user_namespace_callouts
     ADD CONSTRAINT user_namespace_callouts_pkey PRIMARY KEY (id);
 
@@ -26980,6 +26988,8 @@ CREATE INDEX index_user_group_callouts_on_group_id ON user_group_callouts USING
 
 CREATE INDEX index_user_highest_roles_on_user_id_and_highest_access_level ON user_highest_roles USING btree (user_id, highest_access_level);
 
+CREATE INDEX index_user_interacted_projects_on_user_id ON user_interacted_projects USING btree (user_id);
+
 CREATE INDEX index_user_namespace_callouts_on_namespace_id ON user_namespace_callouts USING btree (namespace_id);
 
 CREATE INDEX index_user_permission_export_uploads_on_user_id_and_status ON user_permission_export_uploads USING btree (user_id, status);
@@ -29228,6 +29238,9 @@ ALTER TABLE ONLY sbom_occurrences_vulnerabilities
 ALTER TABLE ONLY abuse_report_user_mentions
     ADD CONSTRAINT fk_088018ecd8 FOREIGN KEY (abuse_report_id) REFERENCES abuse_reports(id) ON DELETE CASCADE;
 
+ALTER TABLE ONLY user_interacted_projects
+    ADD CONSTRAINT fk_0894651f08 FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY merge_request_assignment_events
     ADD CONSTRAINT fk_08f7602bfd FOREIGN KEY (merge_request_id) REFERENCES merge_requests(id) ON DELETE CASCADE;
 
@@ -29663,6 +29676,9 @@ ALTER TABLE ONLY protected_branch_push_access_levels
 ALTER TABLE ONLY integrations
     ADD CONSTRAINT fk_71cce407f9 FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;
 
+ALTER TABLE ONLY user_interacted_projects
+    ADD CONSTRAINT fk_722ceba4f7 FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY subscription_user_add_on_assignments
     ADD CONSTRAINT fk_724c2df9a8 FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE;
 

doc/administration/auth/ldap/index.md

@@ -1272,7 +1272,7 @@ For more information on synchronizing users and groups between LDAP and GitLab,
    - `omniauth_auto_link_user` to `saml` only.
    - `omniauth_auto_link_ldap_user` to false.
    - `ldap_enabled` to `false`.
-   You can also comment out the LDAP provider settings.
+     You can also comment out the LDAP provider settings.
 
 ## Troubleshooting
 

doc/administration/auth/oidc.md

@@ -328,7 +328,7 @@ but `LocalAccounts` authenticates against local Active Directory accounts. Befor
    ```
 
 1. For OIDC discovery to work with B2C, configure the policy with an issuer compatible with the
-  [OIDC specification](https://openid.net/specs/openid-connect-discovery-1_0.html#rfc.section.4.3).
+   [OIDC specification](https://openid.net/specs/openid-connect-discovery-1_0.html#rfc.section.4.3).
    See the [token compatibility settings](https://learn.microsoft.com/en-us/azure/active-directory-b2c/configure-tokens?pivots=b2c-custom-policy#token-compatibility-settings).
    In `TrustFrameworkBase.xml` under `JwtIssuer`, set `IssuanceClaimPattern` to `AuthorityWithTfp`:
 

doc/administration/docs_self_host.md

@@ -96,8 +96,8 @@ To host the product documentation site with GitLab Pages:
    image: registry.gitlab.com/gitlab-org/gitlab-docs/archives:16.0
    pages:
      script:
-     - mkdir public
-     - cp -a /usr/share/nginx/html/* public/
+       - mkdir public
+       - cp -a /usr/share/nginx/html/* public/
      artifacts:
        paths:
        - public
@@ -136,7 +136,7 @@ In this example:
 
 - `16.0/` is the directory where the documentation is hosted.
 - `index.html` is a simple HTML file that redirects to the directory containing the documentation. In this
-   case, `16.0/`.
+  case, `16.0/`.
 
 To extract the HTML files of the documentation site:
 

doc/administration/geo/index.md

@@ -128,8 +128,8 @@ NOTE:
 
 - All sites must run [the same PostgreSQL versions](setup/database.md#postgresql-replication).
   - Where possible, you should also use the same operating system version on all
-  Geo sites. If using different operating system versions between Geo sites, you
-  **must** [check OS locale data compatibility](replication/troubleshooting.md#check-os-locale-data-compatibility)
+    Geo sites. If using different operating system versions between Geo sites, you
+    **must** [check OS locale data compatibility](replication/troubleshooting.md#check-os-locale-data-compatibility)
     across Geo sites to avoid silent corruption of database indexes.
 - Git 2.9 or later
 - Git-lfs 2.4.2 or later on the user side when using LFS

doc/administration/geo/replication/configuration.md

@@ -223,17 +223,17 @@ In the following steps, replace `<ssh_host_key_path>` with the one you're using:
    1. On the left sidebar, at the bottom, select **Admin Area**.
    1. On the left sidebar, select **Geo > Sites**.
    1. Select **Add site**.
-   ![Add secondary site](img/adding_a_secondary_v15_8.png)
+      ![Add secondary site](img/adding_a_secondary_v15_8.png)
    1. In **Name**, enter the value for `gitlab_rails['geo_node_name']` in
-   `/etc/gitlab/gitlab.rb`. These values must always match **exactly**, character
-   for character.
+      `/etc/gitlab/gitlab.rb`. These values must always match **exactly**, character
+      for character.
    1. In **External URL**, enter the value for `external_url` in `/etc/gitlab/gitlab.rb`. These
-   values must always match, but it doesn't matter if one ends with a `/` and
-   the other doesn't.
+      values must always match, but it doesn't matter if one ends with a `/` and
+      the other doesn't.
    1. Optional. In **Internal URL (optional)**, enter an internal URL for the primary site.
    1. Optional. Select which groups or storage shards should be replicated by the
-   **secondary** site. Leave blank to replicate all. For more information, see
-   [selective synchronization](#selective-synchronization).
+      **secondary** site. Leave blank to replicate all. For more information, see
+      [selective synchronization](#selective-synchronization).
    1. Select **Save changes** to add the **secondary** site.
 1. SSH into **each Rails, and Sidekiq node on your secondary** site and restart the services:
 

doc/administration/geo/setup/database.md

@@ -605,7 +605,7 @@ On all GitLab Geo **secondary** sites:
    password for the replication user account to two locations:
 
    - `gitlab-geo.conf`: Used by the PostgreSQL replication process, written to the PostgreSQL data
-      directory, by default at `/var/opt/gitlab/postgresql/data/gitlab-geo.conf`.
+     directory, by default at `/var/opt/gitlab/postgresql/data/gitlab-geo.conf`.
    - `.pgpass`: Used by the `gitlab-psql` user, located by default at `/var/opt/gitlab/postgresql/.pgpass`.
 
    Update the plaintext password in both of these files, and restart PostgreSQL:

doc/administration/geo/setup/two_single_node_external_services.md

@@ -317,7 +317,7 @@ secondary site is a read-only copy.
       ![Add secondary site](../replication/img/adding_a_secondary_v15_8.png)
 
    1. In **Name**, enter the value for `gitlab_rails['geo_node_name']` in
-   `/etc/gitlab/gitlab.rb`. The values must match exactly.
+      `/etc/gitlab/gitlab.rb`. The values must match exactly.
    1. In **External URL**, enter the value for `external_url` in `/etc/gitlab/gitlab.rb`.
       It's okay if one values ends in `/` and the other doesn't. Otherwise, the values must
       match exactly.

doc/administration/geo/setup/two_single_node_sites.md

@@ -164,7 +164,7 @@ Prerequisites:
       you should use the secondary site private address for `postgresql['md5_auth_cidr_addresses']`.
 
    1. Add the following lines to `/etc/gitlab/gitlab.rb`. Be sure to replace the IP
-   addresses with addresses appropriate to your network configuration:
+      addresses with addresses appropriate to your network configuration:
 
       ```ruby
       ##
@@ -563,7 +563,7 @@ You must manually replicate the secret file across all of your secondary sites,
       ![Add secondary site](../replication/img/adding_a_secondary_v15_8.png)
 
    1. In **Name**, enter the value for `gitlab_rails['geo_node_name']` in
-   `/etc/gitlab/gitlab.rb`. The values must match exactly.
+      `/etc/gitlab/gitlab.rb`. The values must match exactly.
    1. In **External URL**, enter the value for `external_url` in `/etc/gitlab/gitlab.rb`.
       It's okay if one values ends in `/` and the other doesn't. Otherwise, the values must
       match exactly.

doc/administration/gitaly/configure_gitaly.md

@@ -619,14 +619,14 @@ to `gitaly['configuration'][:cgroups]` in `/etc/gitlab/gitlab.rb`:
 
 - `mountpoint` is where the parent cgroup directory is mounted. Defaults to `/sys/fs/cgroup`.
 - `hierarchy_root` is the parent cgroup under which Gitaly creates groups, and
-   is expected to be owned by the user and group Gitaly runs as. A Linux package installation
-   creates the set of directories `mountpoint/<cpu|memory>/hierarchy_root`
-   when Gitaly starts.
+  is expected to be owned by the user and group Gitaly runs as. A Linux package installation
+  creates the set of directories `mountpoint/<cpu|memory>/hierarchy_root`
+  when Gitaly starts.
 - `memory_bytes` is the total memory limit that is imposed collectively on all
-   Git processes that Gitaly spawns. 0 implies no limit.
+  Git processes that Gitaly spawns. 0 implies no limit.
 - `cpu_shares` is the CPU limit that is imposed collectively on all Git
-   processes that Gitaly spawns. 0 implies no limit. The maximum is 1024 shares,
-   which represents 100% of CPU.
+  processes that Gitaly spawns. 0 implies no limit. The maximum is 1024 shares,
+  which represents 100% of CPU.
 - `cpu_quota_us` is the [`cfs_quota_us`](https://docs.kernel.org/scheduler/sched-bwc.html#management)
   to throttle the cgroups' processes if they exceed this quota value. We set
   `cfs_period_us` to `100ms` so 1 core is `100000`. 0 implies no limit.
@@ -673,14 +673,14 @@ To configure repository cgroups in Gitaly using the legacy method, use the follo
 in `/etc/gitlab/gitlab.rb`:
 
 - `cgroups_count` is the number of cgroups created. Each time a new
-   command is spawned, Gitaly assigns it to one of these cgroups based
-   on the command line arguments of the command. A circular hashing algorithm assigns
-   commands to these cgroups.
+  command is spawned, Gitaly assigns it to one of these cgroups based
+  on the command line arguments of the command. A circular hashing algorithm assigns
+  commands to these cgroups.
 - `cgroups_mountpoint` is where the parent cgroup directory is mounted. Defaults to `/sys/fs/cgroup`.
 - `cgroups_hierarchy_root` is the parent cgroup under which Gitaly creates groups, and
-   is expected to be owned by the user and group Gitaly runs as. A Linux package installation
-   creates the set of directories `mountpoint/<cpu|memory>/hierarchy_root`
-   when Gitaly starts.
+  is expected to be owned by the user and group Gitaly runs as. A Linux package installation
+  creates the set of directories `mountpoint/<cpu|memory>/hierarchy_root`
+  when Gitaly starts.
 - `cgroups_memory_enabled` enables or disables the memory limit on cgroups.
 - `cgroups_memory_bytes` is the total memory limit each cgroup imposes on the processes added to it.
 - `cgroups_cpu_enabled` enables or disables the CPU limit on cgroups.

doc/administration/gitaly/monitoring.md

@@ -136,11 +136,11 @@ In Prometheus, look for the following metrics:
 You can observe the status of [control groups (cgroups)](configure_gitaly.md#control-groups) using Prometheus:
 
 - `gitaly_cgroups_reclaim_attempts_total`, a gauge for the total number of times
-   there has been a memory reclaim attempt. This number resets each time a server is
-   restarted.
+  there has been a memory reclaim attempt. This number resets each time a server is
+  restarted.
 - `gitaly_cgroups_cpu_usage`, a gauge that measures CPU usage per cgroup.
 - `gitaly_cgroup_procs_total`, a gauge that measures the total number of
-   processes Gitaly has spawned under the control of cgroups.
+  processes Gitaly has spawned under the control of cgroups.
 - `gitaly_cgroup_cpu_cfs_periods_total`, a counter that for the value of [`nr_periods`](https://docs.kernel.org/scheduler/sched-bwc.html#statistics).
 - `gitaly_cgroup_cpu_cfs_throttled_periods_total`, a counter for the value of [`nr_throttled`](https://docs.kernel.org/scheduler/sched-bwc.html#statistics).
 - `gitaly_cgroup_cpu_cfs_throttled_seconds_total`, a counter for the value of [`throttled_time`](https://docs.kernel.org/scheduler/sched-bwc.html#statistics) in seconds.