diff --git a/.deploy.gitlab-ci.yml b/.deploy.gitlab-ci.yml index 21f17249f..835b9c544 100644 --- a/.deploy.gitlab-ci.yml +++ b/.deploy.gitlab-ci.yml @@ -3,9 +3,9 @@ needs: [] rules: - - if: $CI_COMMIT_REF_PROTECTED && $DEPLOY_TARGET =~ $ENVIRONMENT_PATTERN + if: $CI_COMMIT_REF_PROTECTED == 'true' && $DEPLOY_TARGET =~ $ENVIRONMENT_PATTERN - - if: $CI_COMMIT_REF_PROTECTED + if: $CI_COMMIT_REF_PROTECTED == 'true' when: manual image: node:20.12.2 before_script: diff --git a/components/CircleMentions.vue b/components/CircleMentions.vue index 81411462f..4a6bf0b55 100644 --- a/components/CircleMentions.vue +++ b/components/CircleMentions.vue @@ -1,66 +1,61 @@ + + diff --git a/components/Header.vue b/components/Header.vue index 87ae0639b..bea434dcc 100644 --- a/components/Header.vue +++ b/components/Header.vue @@ -224,7 +224,6 @@ import { mapState } from 'pinia'; import type { RouteLocationRaw } from 'vue-router'; import useConfig from '../composables/useConfig.ts'; -import NounsNav from '../data/nouns/NounsNav.vue'; import forbidden from '../src/forbidden.ts'; import type { User } from '../src/user.ts'; import { useMainStore } from '../store/index.ts'; @@ -243,7 +242,7 @@ type HeaderLink = HeaderTo & { }; export default defineComponent({ - components: { NounsNav }, + components: { NounsNav: useLocaleComponent('nouns', 'NounsNav') }, setup() { const hoverItem = ref(null); return { diff --git a/components/Support.vue b/components/Support.vue index f8d5ba8dd..ef3bd4e2b 100644 --- a/components/Support.vue +++ b/components/Support.vue @@ -1,10 +1,8 @@