Add latest changes from gitlab-org/gitlab@13-1-stable-ee

1 files changed, 6 insertions, 0 deletions

diff --git a/spec/services/labels/available_labels_service_spec.rb b/spec/services/labels/available_labels_service_spec.rb
index 3ba1add121d..56826257d6f 100644
--- a/spec/services/labels/available_labels_service_spec.rb
+++ b/spec/services/labels/available_labels_service_spec.rb
@@ -73,6 +73,12 @@ describe Labels::AvailableLabelsService do
 
         expect(result).to match_array([project_label.id, group_label.id])
       end
+
+      it 'returns labels in preserved order' do
+        result = described_class.new(user, project, ids: label_ids.reverse).filter_labels_ids_in_param(:ids)
+
+        expect(result).to eq([group_label.id, project_label.id])
+      end
     end
 
     context 'when parent is a group' do