diff options
Diffstat (limited to 'app/assets/javascripts')
5 files changed, 20 insertions, 20 deletions
diff --git a/app/assets/javascripts/nav/components/new_nav_toggle.vue b/app/assets/javascripts/nav/components/new_nav_toggle.vue index 5eb5e5b9b90..9db123da405 100644 --- a/app/assets/javascripts/nav/components/new_nav_toggle.vue +++ b/app/assets/javascripts/nav/components/new_nav_toggle.vue @@ -1,5 +1,5 @@ <script> -import { GlBadge, GlToggle, GlDisclosureDropdownItem } from '@gitlab/ui'; +import { GlToggle, GlDisclosureDropdownItem } from '@gitlab/ui'; import axios from '~/lib/utils/axios_utils'; import { createAlert } from '~/alert'; import { s__ } from '~/locale'; @@ -7,7 +7,6 @@ import Tracking from '~/tracking'; export default { i18n: { - badgeLabel: s__('NorthstarNavigation|Beta'), sectionTitle: s__('NorthstarNavigation|Navigation redesign'), toggleMenuItemLabel: s__('NorthstarNavigation|New navigation'), toggleLabel: s__('NorthstarNavigation|Toggle new navigation'), @@ -16,7 +15,6 @@ export default { ), }, components: { - GlBadge, GlToggle, GlDisclosureDropdownItem, }, @@ -83,7 +81,6 @@ export default { class="gl-px-4 gl-py-2 gl-display-flex gl-justify-content-space-between gl-align-items-center" > <b>{{ $options.i18n.sectionTitle }}</b> - <gl-badge variant="info">{{ $options.i18n.badgeLabel }}</gl-badge> </div> <div diff --git a/app/assets/javascripts/sentry/index.js b/app/assets/javascripts/sentry/index.js index 5539a061726..ea835945aa9 100644 --- a/app/assets/javascripts/sentry/index.js +++ b/app/assets/javascripts/sentry/index.js @@ -15,8 +15,9 @@ const index = function index() { : [gon.gitlab_url, 'webpack-internal://'], release: gon.revision, tags: { - revision: gon.revision, - feature_category: gon.feature_category, + revision: gon?.revision, + feature_category: gon?.feature_category, + page: document?.body?.dataset?.page, }, }); }; diff --git a/app/assets/javascripts/super_sidebar/components/nav_item.vue b/app/assets/javascripts/super_sidebar/components/nav_item.vue index a4bbd87b34a..9dc26ad10f5 100644 --- a/app/assets/javascripts/super_sidebar/components/nav_item.vue +++ b/app/assets/javascripts/super_sidebar/components/nav_item.vue @@ -136,12 +136,17 @@ export default { </div> </div> <slot name="actions"></slot> - <span v-if="hasPill || isPinnable" class="gl-flex-grow-1 gl-text-right gl-mr-3"> - <gl-badge v-if="hasPill" size="sm" variant="neutral"> + <span v-if="hasPill || isPinnable" class="gl-flex-grow-1 gl-text-right gl-mr-3 gl-relative"> + <gl-badge + v-if="hasPill" + size="sm" + variant="neutral" + class="count-pill gl-absolute gl-right-0" + > {{ pillData }} </gl-badge> <gl-button - v-else-if="isPinnable && !isPinned" + v-if="isPinnable && !isPinned" size="small" category="tertiary" icon="thumbtack" diff --git a/app/assets/javascripts/super_sidebar/components/user_menu.vue b/app/assets/javascripts/super_sidebar/components/user_menu.vue index b8a654124e9..cd5a83c86cc 100644 --- a/app/assets/javascripts/super_sidebar/components/user_menu.vue +++ b/app/assets/javascripts/super_sidebar/components/user_menu.vue @@ -1,7 +1,6 @@ <script> import { GlAvatar, - GlBadge, GlDisclosureDropdown, GlDisclosureDropdownGroup, GlDisclosureDropdownItem, @@ -19,10 +18,9 @@ import UserNameGroup from './user_name_group.vue'; const DROPDOWN_X_OFFSET = -211; export default { - feedbackUrl: 'https://gitlab.com/gitlab-org/gitlab/-/issues/403059', + feedbackUrl: 'https://gitlab.com/gitlab-org/gitlab/-/issues/409005', i18n: { newNavigation: { - badgeLabel: s__('NorthstarNavigation|Beta'), sectionTitle: s__('NorthstarNavigation|Navigation redesign'), }, setStatus: s__('SetStatusModal|Set status'), @@ -38,7 +36,6 @@ export default { }, components: { GlAvatar, - GlBadge, GlDisclosureDropdown, GlDisclosureDropdownGroup, GlDisclosureDropdownItem, @@ -140,7 +137,7 @@ export default { extraAttrs: { target: '_blank', ...USER_MENU_TRACKING_DEFAULTS, - 'data-track-label': 'provide_nav_beta_feedback', + 'data-track-label': 'provide_nav_feedback', }, }; }, @@ -320,9 +317,6 @@ export default { <gl-disclosure-dropdown-group bordered> <template #group-label> <span class="gl-font-sm">{{ $options.i18n.newNavigation.sectionTitle }}</span> - <gl-badge size="sm" variant="info" - >{{ $options.i18n.newNavigation.badgeLabel }} - </gl-badge> </template> <new-nav-toggle :endpoint="toggleNewNavEndpoint" enabled new-navigation /> <gl-disclosure-dropdown-item :item="feedbackItem" data-testid="feedback-item" /> diff --git a/app/assets/javascripts/vue_shared/components/source_viewer/constants.js b/app/assets/javascripts/vue_shared/components/source_viewer/constants.js index 514b626ed95..58db1ceda95 100644 --- a/app/assets/javascripts/vue_shared/components/source_viewer/constants.js +++ b/app/assets/javascripts/vue_shared/components/source_viewer/constants.js @@ -141,6 +141,9 @@ export const BIDI_CHARS_CLASS_LIST = 'unicode-bidi has-tooltip'; export const BIDI_CHAR_TOOLTIP = 'Potentially unwanted character detected: Unicode BiDi Control'; -// We fallback to highlighting these languages with Rouge, see the following issue for more detail: -// https://gitlab.com/gitlab-org/gitlab/-/issues/384375#note_1212752013 -export const LEGACY_FALLBACKS = ['python']; +/** + * We fallback to highlighting these languages with Rouge, see the following issues for more detail: + * Python: https://gitlab.com/gitlab-org/gitlab/-/issues/384375#note_1212752013 + * HAML: https://github.com/highlightjs/highlight.js/issues/3783 + * */ +export const LEGACY_FALLBACKS = ['python', 'haml']; |