Commit ce12bb13 authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents e4ed7db8 ae91b321
<script> <script>
import _ from 'underscore';
import { GlTooltipDirective } from '@gitlab/ui'; import { GlTooltipDirective } from '@gitlab/ui';
import { sprintf, __ } from '~/locale'; import { sprintf, __ } from '~/locale';
import Icon from '~/vue_shared/components/icon.vue'; import Icon from '~/vue_shared/components/icon.vue';
...@@ -94,6 +95,9 @@ export default { ...@@ -94,6 +95,9 @@ export default {
const { referencePath, groupId } = this.issue; const { referencePath, groupId } = this.issue;
return !groupId ? referencePath.split('#')[0] : null; return !groupId ? referencePath.split('#')[0] : null;
}, },
orderedLabels() {
return _.sortBy(this.issue.labels, 'title');
},
}, },
methods: { methods: {
isIndexLessThanlimit(index) { isIndexLessThanlimit(index) {
...@@ -178,7 +182,7 @@ export default { ...@@ -178,7 +182,7 @@ export default {
</div> </div>
<div v-if="showLabelFooter" class="board-card-labels prepend-top-4 d-flex flex-wrap"> <div v-if="showLabelFooter" class="board-card-labels prepend-top-4 d-flex flex-wrap">
<button <button
v-for="label in issue.labels" v-for="label in orderedLabels"
v-if="showLabel(label)" v-if="showLabel(label)"
:key="label.id" :key="label.id"
v-gl-tooltip v-gl-tooltip
......
---
title: Order labels alphabetically in issue boards
merge_request: 26927
author:
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment