Move issues sort logic to Issuable concern

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

1 files changed, 1 insertions, 15 deletions

diff --git a/app/contexts/issues/list_context.rb b/app/contexts/issues/list_context.rb
index b256fd4c732..6de14d8cd4f 100644
--- a/app/contexts/issues/list_context.rb
+++ b/app/contexts/issues/list_context.rb
@@ -31,23 +31,9 @@ module Issues
       end
 
       # Sort by :sort param
-      @issues = sort(@issues, params[:sort])
+      @issues = @issues.sort(params[:sort])
 
       @issues
     end
-
-    private
-
-    def sort(issues, condition)
-      case condition
-      when 'newest' then issues.except(:order).order('created_at DESC')
-      when 'oldest' then issues.except(:order).order('created_at ASC')
-      when 'recently_updated' then issues.except(:order).order('updated_at DESC')
-      when 'last_updated' then issues.except(:order).order('updated_at ASC')
-      when 'milestone_due_soon' then issues.except(:order).joins(:milestone).order("milestones.due_date ASC")
-      when 'milestone_due_later' then issues.except(:order).joins(:milestone).order("milestones.due_date DESC")
-      else issues
-      end
-    end
   end
 end