Merge branch '51839-remove-sorting-on-project-tags' into 'master'

Preserve order of project tags list

Closes #51839

See merge request gitlab-org/gitlab-ce!21897

app/models/project.rb

@@ -111,7 +111,7 @@ class Project < ActiveRecord::Base
   after_create :ensure_storage_path_exists
   after_save :ensure_storage_path_exists, if: :namespace_id_changed?
 
-  acts_as_taggable
+  acts_as_ordered_taggable
 
   attr_accessor :old_path_with_namespace
   attr_accessor :template_name

app/views/projects/edit.html.haml

@@ -40,7 +40,7 @@
 
         .form-group
           = f.label :tag_list, "Tags", class: 'label-bold'
-          = f.text_field :tag_list, value: @project.tag_list.sort.join(', '), maxlength: 2000, class: "form-control"
+          = f.text_field :tag_list, value: @project.tag_list.join(', '), maxlength: 2000, class: "form-control"
           %p.form-text.text-muted Separate tags with commas.
         %fieldset.features
           %h5.prepend-top-0= _("Project avatar")

changelogs/unreleased/51839-remove-sorting-on-project-tags.yml

+---
+title: Preserve order of project tags list
+merge_request: 21897
+author:
+type: changed

spec/features/projects/settings/user_tags_project_spec.rb

@@ -9,15 +9,13 @@ describe 'Projects > Settings > User tags a project' do
     visit edit_project_path(project)
   end
 
-  context 'when a project is archived' do
-    it 'unarchives a project' do
-      fill_in 'Tags', with: 'tag1, tag2'
+  it 'sets project tags' do
+    fill_in 'Tags', with: 'tag1, tag2'
 
-      page.within '.general-settings' do
-        click_button 'Save changes'
-      end
-
-      expect(find_field('Tags').value).to eq 'tag1, tag2'
+    page.within '.general-settings' do
+      click_button 'Save changes'
     end
+
+    expect(find_field('Tags').value).to eq 'tag1, tag2'
   end
 end