Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42

1 files changed, 6 insertions, 1 deletions

diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/milestone_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/milestone_token.vue
index 0d3394788fa..11c081ab4f8 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/milestone_token.vue
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/milestone_token.vue
@@ -57,7 +57,12 @@ export default {
         .fetchMilestones(searchTerm)
         .then((response) => {
           const data = Array.isArray(response) ? response : response.data;
-          this.milestones = data.slice().sort(sortMilestonesByDueDate);
+
+          if (this.config.shouldSkipSort) {
+            this.milestones = data;
+          } else {
+            this.milestones = data.slice().sort(sortMilestonesByDueDate);
+          }
         })
         .catch(() => {
           createFlash({ message: __('There was a problem fetching milestones.') });