From a53ef56e4f21e689497ac173af6d5adcfb3d561b Mon Sep 17 00:00:00 2001 From: root Date: Fri, 18 Jul 2025 07:38:47 +0000 Subject: [PATCH] Update from merge request --- .../javascripts/groups/your_work/utils.js | 2 +- .../components/user_popover/user_popover.vue | 2 +- app/assets/stylesheets/components/avatar.scss | 15 ------------- app/models/project_statistics.rb | 2 -- .../delete_orphaned_routes.yml | 5 +++-- ...2515_finalize_hk_delete_orphaned_routes.rb | 21 +++++++++++++++++++ db/schema_migrations/20250717232515 | 1 + .../workspace/gitlab_agent_configuration.md | 4 ++-- .../set_up_gitlab_agent_and_proxies.md | 2 +- doc/user/workspace/set_up_infrastructure.md | 8 +++---- spec/frontend/groups/your_work/utils_spec.js | 2 +- 11 files changed, 35 insertions(+), 29 deletions(-) create mode 100644 db/post_migrate/20250717232515_finalize_hk_delete_orphaned_routes.rb create mode 100644 db/schema_migrations/20250717232515 diff --git a/app/assets/javascripts/groups/your_work/utils.js b/app/assets/javascripts/groups/your_work/utils.js index 7f3de1e71d6..1c4e1a810ee 100644 --- a/app/assets/javascripts/groups/your_work/utils.js +++ b/app/assets/javascripts/groups/your_work/utils.js @@ -2,6 +2,6 @@ import { formatGraphQLGroups } from '~/vue_shared/components/groups_list/formatt export const formatGroups = (groups) => formatGraphQLGroups(groups, (group) => ({ - editPath: `${group.relativeWebUrl}/-/edit`, + editPath: `${group.webUrl}/-/edit`, avatarLabel: group.name, })); diff --git a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue index da522633263..0190f98d068 100644 --- a/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue +++ b/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue @@ -136,7 +136,7 @@ export default { return `@${this.user?.username}`; }, cssClasses() { - const classList = ['user-popover', 'gl-max-w-48', 'gl-overflow-hidden']; + const classList = ['user-popover', 'gl-w-34', 'gl-overflow-hidden']; if (this.userCannotMerge) { classList.push('user-popover-cannot-merge'); diff --git a/app/assets/stylesheets/components/avatar.scss b/app/assets/stylesheets/components/avatar.scss index bdd390c512c..6d6d4a6903e 100644 --- a/app/assets/stylesheets/components/avatar.scss +++ b/app/assets/stylesheets/components/avatar.scss @@ -189,21 +189,6 @@ $avatar-sizes: ( } .user-popover { - // GlAvatarLabeled doesn't expose any prop to override internal classes - - // Max width of popover container is set by gl-max-w-48 - // so we need to ensure that name/username/status container doesn't overflow - // stylelint-disable-next-line gitlab/no-gl-class - .gl-avatar-labeled-labels { - max-width: px-to-rem(290px); - } - - // stylelint-disable-next-line gitlab/no-gl-class - .gl-avatar-labeled-label, - .gl-avatar-labeled-sublabel { - @apply gl-truncate; - } - &.user-popover-cannot-merge { .popover-header { background-color: var(--gl-feedback-warning-background-color); diff --git a/app/models/project_statistics.rb b/app/models/project_statistics.rb index 78b03f91a27..308d9a50582 100644 --- a/app/models/project_statistics.rb +++ b/app/models/project_statistics.rb @@ -9,8 +9,6 @@ class ProjectStatistics < ApplicationRecord attribute :wiki_size, default: 0 attribute :snippets_size, default: 0 - ignore_column :vulnerability_count, remove_with: '17.7', remove_after: '2024-11-15' - counter_attribute :build_artifacts_size counter_attribute :packages_size diff --git a/db/docs/batched_background_migrations/delete_orphaned_routes.yml b/db/docs/batched_background_migrations/delete_orphaned_routes.yml index 18e0515190b..ba1321de0fe 100644 --- a/db/docs/batched_background_migrations/delete_orphaned_routes.yml +++ b/db/docs/batched_background_migrations/delete_orphaned_routes.yml @@ -1,8 +1,9 @@ --- migration_job_name: DeleteOrphanedRoutes -description: Deletes the orphaned routes that were not deleted by the loose foreign key +description: Deletes the orphaned routes that were not deleted by the loose foreign + key feature_category: groups_and_projects introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/186659 milestone: '17.11' queued_migration_version: 20250401113424 -finalized_by: # version of the migration that finalized this BBM +finalized_by: '20250717232515' diff --git a/db/post_migrate/20250717232515_finalize_hk_delete_orphaned_routes.rb b/db/post_migrate/20250717232515_finalize_hk_delete_orphaned_routes.rb new file mode 100644 index 00000000000..264aa2e932c --- /dev/null +++ b/db/post_migrate/20250717232515_finalize_hk_delete_orphaned_routes.rb @@ -0,0 +1,21 @@ +# frozen_string_literal: true + +class FinalizeHkDeleteOrphanedRoutes < Gitlab::Database::Migration[2.3] + milestone '18.3' + + disable_ddl_transaction! + + restrict_gitlab_migration gitlab_schema: :gitlab_main_cell + + def up + ensure_batched_background_migration_is_finished( + job_class_name: 'DeleteOrphanedRoutes', + table_name: :routes, + column_name: :id, + job_arguments: [], + finalize: true + ) + end + + def down; end +end diff --git a/db/schema_migrations/20250717232515 b/db/schema_migrations/20250717232515 new file mode 100644 index 00000000000..cf6e5efb5d4 --- /dev/null +++ b/db/schema_migrations/20250717232515 @@ -0,0 +1 @@ +fe8ddd9c103327d9e10e8c55deb3d581470ab8f5ff6b86958bfb3a613f21520f \ No newline at end of file diff --git a/doc/user/workspace/gitlab_agent_configuration.md b/doc/user/workspace/gitlab_agent_configuration.md index 01d1e072993..6d188681364 100644 --- a/doc/user/workspace/gitlab_agent_configuration.md +++ b/doc/user/workspace/gitlab_agent_configuration.md @@ -86,7 +86,7 @@ Prerequisites: To allow a cluster agent for workspaces in a group: 1. On the left sidebar, select **Search or go to** and find your group. -1. On the left sidebar, select **Settings > Workspaces**. +1. On the left sidebar, select **Settings** > **Workspaces**. 1. In the **Group agents** section, select the **All agents** tab. 1. From the list of available agents, find the agent with status **Blocked**, and select **Allow**. 1. On the confirmation dialog, select **Allow agent**. @@ -103,7 +103,7 @@ Prerequisites: To remove an allowed cluster agent from a group: 1. On the left sidebar, select **Search or go to** and find your group. -1. On the left sidebar, select **Settings > Workspaces**. +1. On the left sidebar, select **Settings** > **Workspaces**. 1. In the **Group agents** section, select the **Allowed agents** tab. 1. From the list of allowed agents, find the agent you want to remove, and select **Block**. 1. On the confirmation dialog, select **Block agent**. diff --git a/doc/user/workspace/set_up_gitlab_agent_and_proxies.md b/doc/user/workspace/set_up_gitlab_agent_and_proxies.md index 7b464a2f50f..3b276bba528 100644 --- a/doc/user/workspace/set_up_gitlab_agent_and_proxies.md +++ b/doc/user/workspace/set_up_gitlab_agent_and_proxies.md @@ -135,7 +135,7 @@ Only one agent is required. You can create workspaces from all projects in a gro To allow your GitLab agent for Kubernetes in a group and make it available to all projects in that group: 1. On the left sidebar, select **Search or go to** and find your group. -1. Select **Settings > Workspaces**. +1. Select **Settings** > **Workspaces**. 1. In the **Group agents** section, select the **All agents** tab. 1. For the GitLab agent for Kubernetes, select **Allow**. 1. On the confirmation dialog, select **Allow agent**. diff --git a/doc/user/workspace/set_up_infrastructure.md b/doc/user/workspace/set_up_infrastructure.md index 5b215e0d759..a94d1320581 100644 --- a/doc/user/workspace/set_up_infrastructure.md +++ b/doc/user/workspace/set_up_infrastructure.md @@ -156,7 +156,7 @@ To create a token for the agent: 1. Go to your group. 1. On the left sidebar, select **Search or go to** and find your project. -1. Select **Operate > Kubernetes clusters**. +1. Select **Operate** > **Kubernetes clusters**. 1. Select **Connect a cluster**. 1. Enter a name for your agent and save for later use. For example, `gitlab-workspaces-agentk-eks`. 1. Select **Create and register**. @@ -194,7 +194,7 @@ pipeline can run. To configure CI/CD variables: 1. On the left sidebar, select **Search or go to** and find your project. -1. Select **Settings > CI/CD**. +1. Select **Settings** > **CI/CD**. 1. Expand **Variables**. 1. In the **Project variables** section, add the following required variables: @@ -271,7 +271,7 @@ resources in AWS. To run the pipeline: 1. Create a new pipeline in your GitLab project: - 1. On the left sidebar, select **Build > Pipelines**. + 1. On the left sidebar, select **Build** > **Pipelines**. 1. Select **New pipeline** and select **New pipeline** again to confirm. 1. Verify the `plan` job succeeds, then manually trigger the `apply` job. @@ -309,7 +309,7 @@ Next, you'll authorize the GitLab agent for Kubernetes to connect to your GitLab To authorize the agent: 1. On the left sidebar, select **Search or go to** and find your group. -1. Select **Settings > Workspaces**. +1. Select **Settings** > **Workspaces**. 1. In the **Group agents** section, select the **All agents** tab. 1. From the list of available agents, find the agent with status **Blocked**, and select **Allow**. 1. On the confirmation dialog, select **Allow agent**. diff --git a/spec/frontend/groups/your_work/utils_spec.js b/spec/frontend/groups/your_work/utils_spec.js index c802e34947d..b993d9da480 100644 --- a/spec/frontend/groups/your_work/utils_spec.js +++ b/spec/frontend/groups/your_work/utils_spec.js @@ -10,7 +10,7 @@ describe('formatGroups', () => { expect(formatGroups(graphQLGroups)).toEqual( formatGraphQLGroups(graphQLGroups).map((group) => ({ ...group, - editPath: `${group.relativeWebUrl}/-/edit`, + editPath: `${group.webUrl}/-/edit`, avatarLabel: group.name, children: expect.any(Object), })),