diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-28 12:09:23 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-28 12:09:23 +0300 |
| commit | dba63244c19187d32f1f998403555f1893f5abdb (patch) | |
| tree | d07f5aa931f280617456f80c5c139789598290cf /app/assets/javascripts/boards | |
| parent | 66d107f9394f719c63cb30f53d62b5b5db888e4b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/boards')
| -rw-r--r-- | app/assets/javascripts/boards/components/board_card_inner.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/boards/components/board_list.vue | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/javascripts/boards/components/board_card_inner.vue b/app/assets/javascripts/boards/components/board_card_inner.vue index befd04c29ae..f1b8abaf0f5 100644 --- a/app/assets/javascripts/boards/components/board_card_inner.vue +++ b/app/assets/javascripts/boards/components/board_card_inner.vue @@ -251,7 +251,7 @@ export default { </h4> <slot></slot> </div> - <div v-if="showLabelFooter" class="board-card-labels gl-mt-2 gl-display-flex gl-flex-wrap"> + <div v-if="showLabelFooter" class="board-card-labels gl-mt-2 gl-display-flex gl-flex-wrap-wrap"> <template v-for="label in orderedLabels"> <gl-label :key="label.id" diff --git a/app/assets/javascripts/boards/components/board_list.vue b/app/assets/javascripts/boards/components/board_list.vue index a50bbf7fd7e..5f082066ad4 100644 --- a/app/assets/javascripts/boards/components/board_list.vue +++ b/app/assets/javascripts/boards/components/board_list.vue @@ -419,7 +419,6 @@ export default { v-if="loadingMore" size="sm" :label="$options.i18n.loadingMoreboardItems" - data-testid="count-loading-icon" /> <span v-if="showingAllItems">{{ showingAllItemsText }}</span> <span v-else>{{ paginatedIssueText }}</span> |