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 {
-
+