diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-04 18:20:28 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-04 18:20:28 +0300 |
commit | 7de116050af7a190085c01bbf819e48e708e8eb2 (patch) | |
tree | 5b4e18ac4c1bc801f530324c99676f5d286aadfa /app/assets | |
parent | ac72b79188a14a28eafe55d32641f9939cf5d9c4 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
4 files changed, 10 insertions, 3 deletions
diff --git a/app/assets/javascripts/graphql_shared/possible_types.json b/app/assets/javascripts/graphql_shared/possible_types.json index f266e183662..fe151c2b358 100644 --- a/app/assets/javascripts/graphql_shared/possible_types.json +++ b/app/assets/javascripts/graphql_shared/possible_types.json @@ -200,6 +200,7 @@ "WorkItemWidgetNotifications", "WorkItemWidgetProgress", "WorkItemWidgetRequirementLegacy", + "WorkItemWidgetRolledupDates", "WorkItemWidgetStartAndDueDate", "WorkItemWidgetStatus", "WorkItemWidgetTestReports", diff --git a/app/assets/javascripts/projects/commit_box/info/components/commit_refs.vue b/app/assets/javascripts/projects/commit_box/info/components/commit_refs.vue index 25af4cc8082..684ae5343b0 100644 --- a/app/assets/javascripts/projects/commit_box/info/components/commit_refs.vue +++ b/app/assets/javascripts/projects/commit_box/info/components/commit_refs.vue @@ -107,7 +107,7 @@ export default { </script> <template> - <div class="gl-ml-7"> + <div> <refs-list v-if="hasBranches" :has-containing-refs="hasContainingBranches" diff --git a/app/assets/javascripts/projects/commit_box/info/components/refs_list.vue b/app/assets/javascripts/projects/commit_box/info/components/refs_list.vue index 8ceab9cb60b..7a926c3f4e6 100644 --- a/app/assets/javascripts/projects/commit_box/info/components/refs_list.vue +++ b/app/assets/javascripts/projects/commit_box/info/components/refs_list.vue @@ -1,6 +1,6 @@ <script> import { GlCollapse, GlBadge, GlButton, GlIcon, GlSkeletonLoader } from '@gitlab/ui'; -import { CONTAINING_COMMIT, FETCH_CONTAINING_REFS_EVENT } from '../constants'; +import { CONTAINING_COMMIT, FETCH_CONTAINING_REFS_EVENT, BRANCHES_REF_TYPE } from '../constants'; export default { name: 'RefsList', @@ -55,6 +55,9 @@ export default { isLoadingRefs() { return this.isLoading && !this.containingRefs.length; }, + refIcon() { + return this.refType === BRANCHES_REF_TYPE ? 'branch' : 'tag'; + }, }, methods: { toggleCollapse() { @@ -75,7 +78,8 @@ export default { </script> <template> - <div class="gl-pt-4"> + <div class="gl-p-5 gl-border-b gl-border-gray-50"> + <gl-icon :name="refIcon" :size="14" class="gl-ml-2 gl-mr-3" /> <span data-testid="title" class="gl-mr-2">{{ namespace }}</span> <gl-badge v-for="ref in tippingRefs" diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/constants.js b/app/assets/javascripts/vue_shared/components/filtered_search_bar/constants.js index 5362ceac9ee..6549de96c98 100644 --- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/constants.js +++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/constants.js @@ -67,6 +67,7 @@ export const TOKEN_TITLE_AUTHOR = __('Author'); export const TOKEN_TITLE_CONFIDENTIAL = __('Confidential'); export const TOKEN_TITLE_CONTACT = s__('Crm|Contact'); export const TOKEN_TITLE_GROUP = __('Group'); +export const TOKEN_TITLE_GROUP_INVITE = __('Group invite'); export const TOKEN_TITLE_LABEL = __('Label'); export const TOKEN_TITLE_PROJECT = __('Project'); export const TOKEN_TITLE_MILESTONE = __('Milestone'); @@ -90,6 +91,7 @@ export const TOKEN_TYPE_AUTHOR = 'author'; export const TOKEN_TYPE_CONFIDENTIAL = 'confidential'; export const TOKEN_TYPE_CONTACT = 'contact'; export const TOKEN_TYPE_GROUP = 'group'; +export const TOKEN_TYPE_GROUP_INVITE = 'group-invite'; export const TOKEN_TYPE_EPIC = 'epic'; // As health status gets reused between issue lists and boards // this is in the shared constants. Until we have not decoupled the EE filtered search bar |