summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2014-04-14 12:39:24 -0400
committerRobert Speicher <rspeicher@gmail.com>2014-04-14 12:40:27 -0400
commitc803e78fd0de5e3614cf5881c9688e4c7d40641b (patch)
treefdc8d12197313a9ec85b9078b1c2a6711355482a
parent884390de20532fc78dd1b78efafe9a5acc534c6d (diff)
downloadgitlab-ce-c803e78fd0de5e3614cf5881c9688e4c7d40641b.tar.gz
Use VersionSorter on the Project > Tags page
-rw-r--r--app/controllers/projects/tags_controller.rb3
-rw-r--r--app/views/projects/tags/index.html.haml4
2 files changed, 4 insertions, 3 deletions
diff --git a/app/controllers/projects/tags_controller.rb b/app/controllers/projects/tags_controller.rb
index 818c5d971e9..0b99165bf62 100644
--- a/app/controllers/projects/tags_controller.rb
+++ b/app/controllers/projects/tags_controller.rb
@@ -8,7 +8,8 @@ class Projects::TagsController < Projects::ApplicationController
before_filter :authorize_admin_project!, only: [:destroy]
def index
- @tags = Kaminari.paginate_array(@repository.tags.reverse).page(params[:page]).per(30)
+ sorted = VersionSorter.rsort(@repository.tag_names)
+ @tags = Kaminari.paginate_array(sorted).page(params[:page]).per(30)
end
def create
diff --git a/app/views/projects/tags/index.html.haml b/app/views/projects/tags/index.html.haml
index 53f3e67ff2c..08122fb884f 100644
--- a/app/views/projects/tags/index.html.haml
+++ b/app/views/projects/tags/index.html.haml
@@ -7,13 +7,13 @@
New tag
%p
- Tags give ability to mark specific points in history as being important
+ Tags give the ability to mark specific points in history as being important
%hr
- unless @tags.empty?
%ul.bordered-list
- @tags.each do |tag|
- = render 'tag', tag: tag
+ = render 'tag', tag: @repository.find_tag(tag)
= paginate @tags, theme: 'gitlab'