From c803e78fd0de5e3614cf5881c9688e4c7d40641b Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Mon, 14 Apr 2014 12:39:24 -0400 Subject: [PATCH] Use VersionSorter on the Project > Tags page --- app/controllers/projects/tags_controller.rb | 3 ++- app/views/projects/tags/index.html.haml | 4 ++-- 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'