Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_action_button.vue

@@ -66,7 +66,7 @@ export default {
     :aria-label="buttonTitle"
     :loading="isLoading"
     :disabled="isActionInProgress"
-    :class="`gl-ml-3 ${containerClasses}`"
+    :class="containerClasses"
     :icon="icon"
     @click="$emit('click')"
   >
@@ -81,7 +81,7 @@ export default {
     :aria-label="buttonTitle"
     :loading="isLoading"
     :disabled="isActionInProgress"
-    :class="`gl-ml-3 ${containerClasses}`"
+    :class="containerClasses"
     :icon="icon"
     @click="$emit('click')"
   >

app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_actions.vue

@@ -151,7 +151,7 @@ export default {
 </script>
 
 <template>
-  <div class="gl-inline-flex">
+  <div class="gl-inline-flex gl-gap-3">
     <deployment-action-button
       v-if="canBeManuallyDeployed"
       :action-in-progress="actionInProgress"

app/assets/stylesheets/framework/common.scss

@@ -460,9 +460,7 @@ li.note {
 
 copy-code {
   position: absolute;
-  @apply gl-transition-all;
   opacity: 0;
-
   top: $gl-spacing-scale-3;
   right: $gl-spacing-scale-3;
 

app/assets/stylesheets/page_bundles/merge_requests.scss

@@ -322,25 +322,7 @@
   display: flex;
   align-items: center;
   flex-wrap: wrap;
-
-  @include media-breakpoint-up(xs) {
-    flex-wrap: nowrap;
-    white-space: nowrap;
-  }
-
-  @container mr-widget-extension (max-width: 600px) {
-    flex-direction: column;
-    align-items: flex-start;
-
-    .deployment-info {
-      margin-bottom: $gl-padding-8;
-    }
-
-    // stylelint-disable-next-line gitlab/no-gl-class
-    .gl-button {
-      margin-left: 0;
-    }
-  }
+  justify-content: space-between;
 
   > *:not(:last-child) {
     margin-right: 0.3em;
@@ -351,19 +333,9 @@
   }
 
   .deployment-info {
-    flex: 1;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    min-width: 100px;
-
-    display: grid;
+    white-space: nowrap;display: grid;
     grid-template-columns: max-content minmax(0, max-content) max-content;
     grid-gap: $gl-spacing-scale-2;
-
-    @include media-breakpoint-up(xs) {
-      min-width: 0;
-      max-width: 100%;
-    }
   }
 
   .dropdown-menu {

db/docs/analytics_cycle_analytics_value_stream_settings.yml

@@ -10,12 +10,5 @@ milestone: '16.5'
 gitlab_schema: gitlab_main_cell
 allow_cross_foreign_keys:
 - gitlab_main_clusterwide
-desired_sharding_key:
-  namespace_id:
-    references: namespaces
-    backfill_via:
-      parent:
-        foreign_key: value_stream_id
-        table: analytics_cycle_analytics_group_value_streams
-        sharding_key: group_id
-        belongs_to: value_stream
+sharding_key:
+  namespace_id: namespaces

db/migrate/20241017124709_add_namespace_id_to_analytics_cycle_analytics_value_stream_settings.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AddNamespaceIdToAnalyticsCycleAnalyticsValueStreamSettings < Gitlab::Database::Migration[2.2]
+  milestone '17.6'
+
+  # rubocop:disable Rails/NotNullColumn -- NamespaceId can not have a default value
+  def change
+    add_column :analytics_cycle_analytics_value_stream_settings, :namespace_id, :bigint, null: false
+  end
+  # rubocop:enable Rails/NotNullColumn
+end

db/post_migrate/20241017124710_index_analytics_cycle_analytics_value_stream_settings_on_namespace_id.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class IndexAnalyticsCycleAnalyticsValueStreamSettingsOnNamespaceId < Gitlab::Database::Migration[2.2]
+  milestone '17.6'
+  disable_ddl_transaction!
+
+  INDEX_NAME = 'index_analytics_cycle_analytics_value_stream_settings_on_namesp'
+
+  def up
+    add_concurrent_index :analytics_cycle_analytics_value_stream_settings, :namespace_id, name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :analytics_cycle_analytics_value_stream_settings, INDEX_NAME
+  end
+end

db/post_migrate/20241017124711_add_analytics_cycle_analytics_value_stream_settings_namespace_id_fk.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddAnalyticsCycleAnalyticsValueStreamSettingsNamespaceIdFk < Gitlab::Database::Migration[2.2]
+  milestone '17.6'
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_foreign_key :analytics_cycle_analytics_value_stream_settings, :namespaces, column: :namespace_id,
+      on_delete: :cascade
+  end
+
+  def down
+    with_lock_retries do
+      remove_foreign_key :analytics_cycle_analytics_value_stream_settings, column: :namespace_id
+    end
+  end
+end

db/post_migrate/20241017124712_add_analytics_cycle_analytics_value_stream_settings_namespace_id_trigger.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class AddAnalyticsCycleAnalyticsValueStreamSettingsNamespaceIdTrigger < Gitlab::Database::Migration[2.2]
+  milestone '17.6'
+
+  def up
+    install_sharding_key_assignment_trigger(
+      table: :analytics_cycle_analytics_value_stream_settings,
+      sharding_key: :namespace_id,
+      parent_table: :analytics_cycle_analytics_group_value_streams,
+      parent_sharding_key: :group_id,
+      foreign_key: :value_stream_id
+    )
+  end
+
+  def down
+    remove_sharding_key_assignment_trigger(
+      table: :analytics_cycle_analytics_value_stream_settings,
+      sharding_key: :namespace_id,
+      parent_table: :analytics_cycle_analytics_group_value_streams,
+      parent_sharding_key: :group_id,
+      foreign_key: :value_stream_id
+    )
+  end
+end

db/schema_migrations/20241017124709

@@ -0,0 +1 @@
+40db0d47902dbf54c6c2573fb0aa989e56ed2d4ee015f6733145f6d01d0772a5

db/schema_migrations/20241017124710

@@ -0,0 +1 @@
+e11c91e8de86f13d78b3edd3ba013d037fcb2dd22f07da270e9ff536cb314e3c

db/schema_migrations/20241017124711

@@ -0,0 +1 @@
+576e65acf4940f7194debb21912e5340feb679ebc153770d47ab92127328ec64

db/schema_migrations/20241017124712

@@ -0,0 +1 @@
+a1548e36b359a8071b66e66c18e2331dadeabb0948b304ff21377bb9d8128a37

db/structure.sql

@@ -935,6 +935,22 @@ RETURN NEW;
 END
 $$;
 
+CREATE FUNCTION trigger_0c326daf67cf() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+BEGIN
+IF NEW."namespace_id" IS NULL THEN
+  SELECT "group_id"
+  INTO NEW."namespace_id"
+  FROM "analytics_cycle_analytics_group_value_streams"
+  WHERE "analytics_cycle_analytics_group_value_streams"."id" = NEW."value_stream_id";
+END IF;
+
+RETURN NEW;
+
+END
+$$;
+
 CREATE FUNCTION trigger_0da002390fdc() RETURNS trigger
     LANGUAGE plpgsql
     AS $$
@@ -6050,6 +6066,7 @@ ALTER SEQUENCE analytics_cycle_analytics_stage_event_hashes_id_seq OWNED BY anal
 CREATE TABLE analytics_cycle_analytics_value_stream_settings (
     value_stream_id bigint NOT NULL,
     project_ids_filter bigint[] DEFAULT '{}'::bigint[],
+    namespace_id bigint NOT NULL,
     CONSTRAINT project_ids_filter_array_check CHECK (((cardinality(project_ids_filter) <= 100) AND (array_position(project_ids_filter, NULL::bigint) IS NULL)))
 );
 
@@ -28161,6 +28178,8 @@ CREATE UNIQUE INDEX index_analytics_ca_group_value_streams_on_group_id_and_name
 
 CREATE INDEX index_analytics_cycle_analytics_group_stages_custom_only ON analytics_cycle_analytics_group_stages USING btree (id) WHERE (custom = true);
 
+CREATE INDEX index_analytics_cycle_analytics_value_stream_settings_on_namesp ON analytics_cycle_analytics_value_stream_settings USING btree (namespace_id);
+
 CREATE UNIQUE INDEX index_analytics_dashboards_pointers_on_namespace_id ON analytics_dashboards_pointers USING btree (namespace_id);
 
 CREATE INDEX index_analytics_dashboards_pointers_on_target_project_id ON analytics_dashboards_pointers USING btree (target_project_id);
@@ -34231,6 +34250,8 @@ CREATE TRIGGER trigger_0a1b0adcf686 BEFORE INSERT OR UPDATE ON packages_debian_p
 
 CREATE TRIGGER trigger_0a29d4d42b62 BEFORE INSERT OR UPDATE ON approval_project_rules_protected_branches FOR EACH ROW EXECUTE FUNCTION trigger_0a29d4d42b62();
 
+CREATE TRIGGER trigger_0c326daf67cf BEFORE INSERT OR UPDATE ON analytics_cycle_analytics_value_stream_settings FOR EACH ROW EXECUTE FUNCTION trigger_0c326daf67cf();
+
 CREATE TRIGGER trigger_0da002390fdc BEFORE INSERT OR UPDATE ON operations_feature_flags_issues FOR EACH ROW EXECUTE FUNCTION trigger_0da002390fdc();
 
 CREATE TRIGGER trigger_0e13f214e504 BEFORE INSERT OR UPDATE ON merge_request_assignment_events FOR EACH ROW EXECUTE FUNCTION trigger_0e13f214e504();
@@ -35962,6 +35983,9 @@ ALTER TABLE ONLY packages_composer_metadata
 ALTER TABLE ONLY approval_project_rules_protected_branches
     ADD CONSTRAINT fk_e6ee913fc2 FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;
 
+ALTER TABLE ONLY analytics_cycle_analytics_value_stream_settings
+    ADD CONSTRAINT fk_e6fcfdeb81 FOREIGN KEY (namespace_id) REFERENCES namespaces(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY merge_requests
     ADD CONSTRAINT fk_e719a85f8a FOREIGN KEY (author_id) REFERENCES users(id) ON DELETE SET NULL;
 

doc/administration/geo/setup/two_single_node_external_services.md

@@ -317,7 +317,7 @@ secondary site is a read-only copy.
    1. Select **Geo > Sites**.
    1. Select **Add site**.
 
-      ![Add secondary site](../replication/img/adding_a_secondary_v15_8.png)
+      ![Form to add a new secondary Geo 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.

doc/administration/self_hosted_models/configure_duo_features.md

@@ -108,7 +108,7 @@ Configure the GitLab Duo feature to send queries to the configured self-hosted m
    - Choose the self-hosted model you want to use, for example, `Mistral`.
 1. Select **Save Changes**.
 
-### Configure the features to use GitLab AI Vendor models
+### Configure the features to use GitLab AI vendor models
 
 You can choose a GitLab AI vendor to be the GitLab Duo feature's model provider. The
 feature then uses the GitLab-hosted model through the GitLab Cloud Connector:

doc/ci/jobs/index.md

@@ -104,7 +104,7 @@ can find the reason:
 
 In each place, if you hover over the failed job you can see the reason it failed.
 
-![Pipeline detail](img/job_failure_reason_v10_7.png)
+![A pipeline graph showing a failed job and the failure-reason.](img/job_failure_reason_v10_7.png)
 
 You can also see the reason it failed on the Job detail page.
 
@@ -148,11 +148,11 @@ to read.
 You can automatically group similar jobs together. If the job names are formatted in a certain way,
 they are collapsed into a single group in regular pipeline graphs (not the mini graphs).
 
-You can recognize when a pipeline has grouped jobs if you don't see the retry or
-cancel button inside them. Hovering over them shows the number of grouped
-jobs. Select to expand them.
+You can recognize when a pipeline has grouped jobs if you see a number next to a job
+name instead of the retry or cancel buttons. The number indicates the amount of grouped
+jobs. Hovering over them shows you if all jobs have passed or any has failed. Select to expand them.
 
-![Grouped pipelines](img/pipeline_grouped_jobs_v14_2.png)
+![A pipeline graph showing several stages and jobs, including three groups of grouped jobs.](img/pipeline_grouped_jobs_v14_2.png)
 
 To create a group of jobs, in the `.gitlab-ci.yml` file,
 separate each job name with a number and one of the following:
@@ -292,7 +292,7 @@ the [variable is overridden](../variables/index.md#override-a-defined-cicd-varia
 Any variables overridden by using this process are [expanded](../variables/index.md#prevent-cicd-variable-expansion)
 and not [masked](../variables/index.md#mask-a-cicd-variable).
 
-![Manual job variables](img/manual_job_variables_v13_10.png)
+![The run manual job page with fields for specifying CI/CD variables.](img/manual_job_variables_v13_10.png)
 
 ## Delay a job
 
@@ -307,7 +307,7 @@ For example, if you start rolling out new code and:
 - Users experience trouble with the new code, you can stop the timed incremental rollout by canceling the pipeline
   and [rolling](../environments/index.md#retry-or-roll-back-a-deployment) back to the last stable version.
 
-![Pipelines example](img/pipeline_delayed_job_v14_2.png)
+![A pipeline graph with a delayed job.](img/pipeline_delayed_job_v14_2.png)
 
 ## Deployment jobs
 

doc/development/observability/index.md

@@ -9,9 +9,10 @@ description: "Documentation for developers interested in contributing features o
 
 ## GitLab Observability development setup
 
-There are two options for developing and debugging GitLab Observability:
+There are several options for developing and debugging GitLab Observability:
 
-- [Run GDK locally and connect to the staging instance](#run-gdk-and-connect-to-the-staging-instance-of-gitlab-observability-backend) of [GitLab Observability Backend](https://gitlab.com/gitlab-org/opstrace/opstrace). This is the simplest and recommended approach for those looking to make changes, or verify changes to Rails, Sidekiq or Workhorse.
+- [Run GDK and GitLab Observability Backend locally all-in-one](https://gitlab.com/gitlab-org/gitlab-development-kit/-/blob/main/doc/howto/gitlab_observability_backend.md): This is the simplest and recommended approach for those looking to make changes, or verify changes to Rails, Sidekiq or Workhorse.
+- [Run GDK locally and connect to the staging instance](#run-gdk-and-connect-to-the-staging-instance-of-gitlab-observability-backend) of [GitLab Observability Backend](https://gitlab.com/gitlab-org/opstrace/opstrace). This is an alternative approach for those looking to make changes, or verify changes to Rails, Sidekiq or Workhorse.
 - [Use the purpose built `devvm`](#use-the-purpose-built-devvm). This is more involved but includes a development deployment of the [GitLab Observability Backend](https://gitlab.com/gitlab-org/opstrace/opstrace). This is recommended for those who want to make changes to the GitLab Observability Backend component.
 - [Run GDK with mocked Observability data](#run-gdk-with-mocked-observability-data). This could be useful in case you just need to work on a frontend or Rails change and do not need the full stack, or when providing reproduction steps for an MR reviewer, who probably won't want to set up the full stack just for an MR.