Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDennis Tang <dennis@dennistang.net>2018-09-26 12:41:37 +0300
committerNick Thomas <nick@gitlab.com>2018-09-26 12:41:37 +0300
commit715221d629e922261b34920d3e9638c2d78ef1bb (patch)
tree70cd9f4bebb4aa7c5b2ea1d6644c2babf1bdc4fc /app
parent03e092065ecda656bc493a303bf6ebe02b67f6ff (diff)
Preserve order of project tags list
Diffstat (limited to 'app')
-rw-r--r--app/models/project.rb2
-rw-r--r--app/views/projects/edit.html.haml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index 1156a400a21..503fbc30768 100644
--- a/app/models/project.rb
+++ b/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
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 96ab582b050..bfd165d8ba5 100644
--- a/app/views/projects/edit.html.haml
+++ b/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")