From 0daed6230da9997e725f983e8c7477fb78cedc56 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 14 Feb 2024 21:08:31 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../components/kubernetes_status_bar.vue | 8 +- .../javascripts/environments/constants.js | 14 +- .../graphql_shared/possible_types.json | 3 + .../javascripts/observability/client.js | 1 + .../profile/components/user_achievements.vue | 4 +- .../branch_rules/components/branch_rule.vue | 2 +- .../components/organization_switcher.vue | 7 +- .../usage_quotas/group_view_metadata.js | 1 + .../work_item_attributes_wrapper.vue | 82 ++--- .../user_organizations_finder.rb | 7 +- .../resolvers/users/organizations_resolver.rb | 4 + app/models/organizations/organization.rb | 6 + app/models/project.rb | 7 +- app/views/projects/branches/_branch.html.haml | 4 +- app/views/projects/tags/_tag.html.haml | 2 +- .../gitlab_com_derisk/store_object_format.yml | 9 - .../20210216180308_personal_snippets.yml | 2 +- ...5_action_monthly_active_users_sse_edit.yml | 2 +- ..._action_monthly_active_users_wiki_repo.yml | 2 +- .../20210216184024_g_edit_by_sse_monthly.yml | 2 +- .../20210216184022_g_edit_by_sse_weekly.yml | 2 +- ...0210216180259_static_site_editor_views.yml | 2 +- ...10216180301_static_site_editor_commits.yml | 2 +- ...0303_static_site_editor_merge_requests.yml | 2 +- .../20210216181946_pages_domains.yml | 2 +- .../license/20210204124936_pages_version.yml | 2 +- .../settings/20210204124934_pages_enabled.yml | 2 +- ...ndex_on_name_and_path_for_organizations.rb | 20 ++ db/schema_migrations/20240213091123 | 1 + db/structure.sql | 4 + doc/api/graphql/reference/index.md | 293 +++++++++++++++++- .../cloud/aws/gitlab_aws_integration.md | 2 +- doc/subscriptions/gitlab_com/index.md | 6 +- doc/subscriptions/subscription-add-ons.md | 2 + lib/gitlab/fogbugz_import/importer.rb | 58 ++-- lib/gitlab/private_commit_email.rb | 6 +- locale/gitlab.pot | 13 +- package.json | 2 +- qa/qa/page/project/web_ide/vscode.rb | 4 +- .../user_organizations_finder_spec.rb | 38 ++- .../artifact_registry/artifacts.json | 14 + .../artifact_registry/docker_image.json | 81 +++++ .../artifact_registry/repository.json | 24 ++ .../kubernetes_status_bar_spec.js | 10 +- spec/frontend/fixtures/users.rb | 12 +- spec/frontend/observability/client_spec.js | 13 + .../components/user_achievements_spec.js | 11 +- .../users/organizations_resolver_spec.rb | 47 +++ .../gitlab/fogbugz_import/importer_spec.rb | 85 +++-- spec/lib/gitlab/private_commit_email_spec.rb | 10 +- .../models/organizations/organization_spec.rb | 28 ++ spec/models/project_spec.rb | 16 - yarn.lock | 8 +- 53 files changed, 788 insertions(+), 203 deletions(-) delete mode 100644 config/feature_flags/gitlab_com_derisk/store_object_format.yml create mode 100644 db/migrate/20240213091123_add_trigram_index_on_name_and_path_for_organizations.rb create mode 100644 db/schema_migrations/20240213091123 create mode 100644 spec/fixtures/api/schemas/graphql/google_cloud/artifact_registry/artifacts.json create mode 100644 spec/fixtures/api/schemas/graphql/google_cloud/artifact_registry/docker_image.json create mode 100644 spec/fixtures/api/schemas/graphql/google_cloud/artifact_registry/repository.json create mode 100644 spec/graphql/resolvers/users/organizations_resolver_spec.rb diff --git a/app/assets/javascripts/environments/components/kubernetes_status_bar.vue b/app/assets/javascripts/environments/components/kubernetes_status_bar.vue index 8b305160b2b..b41d1773851 100644 --- a/app/assets/javascripts/environments/components/kubernetes_status_bar.vue +++ b/app/assets/javascripts/environments/components/kubernetes_status_bar.vue @@ -181,8 +181,12 @@ export default {
{{ $options.i18n.healthLabel }} - - {{ healthBadge.text }} + {{ healthBadge.text }}
diff --git a/app/assets/javascripts/environments/constants.js b/app/assets/javascripts/environments/constants.js index c996d70af52..64873a6ac68 100644 --- a/app/assets/javascripts/environments/constants.js +++ b/app/assets/javascripts/environments/constants.js @@ -98,41 +98,43 @@ export const HEALTH_BADGES = { success: { variant: 'success', text: CLUSTER_STATUS_HEALTHY_TEXT, + icon: 'status-success', }, error: { variant: 'danger', text: CLUSTER_STATUS_UNHEALTHY_TEXT, + icon: 'status-alert', }, }; export const SYNC_STATUS_BADGES = { reconciled: { variant: 'success', - icon: 'status_success', + icon: 'status-success', text: s__('Environment|Reconciled'), popoverText: s__('Deployment|Flux sync reconciled successfully'), }, reconciling: { variant: 'info', - icon: 'status_running', + icon: 'status-running', text: s__('Environment|Reconciling'), popoverText: s__('Deployment|Flux sync reconciling'), }, stalled: { variant: 'warning', - icon: 'status_pending', + icon: 'status-paused', text: s__('Environment|Stalled'), popoverTitle: s__('Deployment|Flux sync stalled'), }, failed: { variant: 'danger', - icon: 'status_failed', + icon: 'status-failed', text: s__('Deployment|Failed'), popoverTitle: s__('Deployment|Flux sync failed'), }, unknown: { variant: 'neutral', - icon: 'status_notfound', + icon: 'status-waiting', text: s__('Deployment|Unknown'), popoverTitle: s__('Deployment|Flux sync status is unknown'), popoverText: s__( @@ -142,7 +144,7 @@ export const SYNC_STATUS_BADGES = { }, unavailable: { variant: 'muted', - icon: 'status_notfound', + icon: 'status-waiting', text: s__('Deployment|Unavailable'), popoverTitle: s__('Deployment|Flux sync status is unavailable'), popoverText: s__( diff --git a/app/assets/javascripts/graphql_shared/possible_types.json b/app/assets/javascripts/graphql_shared/possible_types.json index 7e1c3c5c78e..1322d4082c8 100644 --- a/app/assets/javascripts/graphql_shared/possible_types.json +++ b/app/assets/javascripts/graphql_shared/possible_types.json @@ -52,6 +52,9 @@ "ExternalAuditEventDestination", "InstanceExternalAuditEventDestination" ], + "GoogleCloudArtifactRegistryArtifact": [ + "GoogleCloudArtifactRegistryDockerImage" + ], "GoogleCloudLoggingConfigurationInterface": [ "GoogleCloudLoggingConfigurationType", "InstanceGoogleCloudLoggingConfigurationType" diff --git a/app/assets/javascripts/observability/client.js b/app/assets/javascripts/observability/client.js index 335c70d220c..056eeec85be 100644 --- a/app/assets/javascripts/observability/client.js +++ b/app/assets/javascripts/observability/client.js @@ -410,6 +410,7 @@ async function fetchMetric(searchUrl, name, type, options = {}) { const { data } = await axios.get(searchUrl, { params, + signal: options.abortController?.signal, withCredentials: true, }); diff --git a/app/assets/javascripts/profile/components/user_achievements.vue b/app/assets/javascripts/profile/components/user_achievements.vue index f317f7871f8..e86d807d87f 100644 --- a/app/assets/javascripts/profile/components/user_achievements.vue +++ b/app/assets/javascripts/profile/components/user_achievements.vue @@ -7,6 +7,8 @@ import { TYPENAME_USER } from '~/graphql_shared/constants'; import timeagoMixin from '~/vue_shared/mixins/timeago'; import getUserAchievements from './graphql/get_user_achievements.query.graphql'; +export const MAX_VISIBLE_ACHIEVEMENTS = 7; + export default { name: 'UserAchievements', components: { GlAvatar, GlBadge, GlPopover, GlSprintf }, @@ -36,7 +38,7 @@ export default { methods: { processNodes(nodes) { return Object.entries(groupBy(nodes, 'achievement.id')) - .slice(0, 3) + .slice(0, MAX_VISIBLE_ACHIEVEMENTS) .map(([id, values]) => { const { achievement: { name, avatarUrl, description, namespace }, diff --git a/app/assets/javascripts/projects/settings/repository/branch_rules/components/branch_rule.vue b/app/assets/javascripts/projects/settings/repository/branch_rules/components/branch_rule.vue index 9aca74c9863..8e53141cb2a 100644 --- a/app/assets/javascripts/projects/settings/repository/branch_rules/components/branch_rule.vue +++ b/app/assets/javascripts/projects/settings/repository/branch_rules/components/branch_rule.vue @@ -166,7 +166,7 @@ export default { $options.i18n.defaultLabel }} - {{ + {{ $options.i18n.protectedLabel }} diff --git a/app/assets/javascripts/super_sidebar/components/organization_switcher.vue b/app/assets/javascripts/super_sidebar/components/organization_switcher.vue index 7122f147d3e..a47c718d99b 100644 --- a/app/assets/javascripts/super_sidebar/components/organization_switcher.vue +++ b/app/assets/javascripts/super_sidebar/components/organization_switcher.vue @@ -108,7 +108,12 @@ export default {