Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
33d73a6b7b2c
Commit
33d73a6b
authored
Sep 26, 2018
by
Dennis Tang
Browse files
Preserve order of project tags list
parent
14b18b9c4ffb
Changes
4
Hide whitespace changes
Inline
Side-by-side
app/models/project.rb
View file @
33d73a6b
...
...
@@ -111,7 +111,7 @@
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
View file @
33d73a6b
...
...
@@ -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
0 → 100644
View file @
33d73a6b
---
title
:
Preserve order of project tags list
merge_request
:
21897
author
:
type
:
changed
spec/features/projects/settings/user_tags_project_spec.rb
View file @
33d73a6b
...
...
@@ -9,7 +9,6 @@
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'
...
...
@@ -15,5 +14,5 @@
page
.
within
'.general-settings'
do
click_button
'Save changes'
end
page
.
within
'.general-settings'
do
click_button
'Save changes'
end
...
...
@@ -19,5 +18,4 @@
expect
(
find_field
(
'Tags'
).
value
).
to
eq
'tag1, tag2'
end
expect
(
find_field
(
'Tags'
).
value
).
to
eq
'tag1, tag2'
end
end
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment