Merge commit '46e4ed6bd0c8c256bce6d35b4bb992d77fd09971' into feature/multi-level-container-registry-imagesfeature/multi-level-container-registry-images

* commit '46e4ed6bd0c8c256bce6d35b4bb992d77fd09971': (28 commits)
  Award emoji button smiley animation
  Introduced empty/error UX states to environments monitoring.
  Github import rake task
  Remove individual modal width styles
  Fix RuboCop for removing index
  Link to docs site for file in doc/
  Disable invalid service templates (again)
  Show CI status as Favicon on Pipelines, Job and MR pages
  STL file viewer
  Wait for the PDF to be loaded before doing anything
  remove unnecessary lease as cron job
  Search for opened MRs - include reopened  MRs
  ProjectsFinder should handle more options
  Clearly show who triggered the pipeline in email
  Make it possible to preview pipeline success/failed emails
  Add remove_concurrent_index to database helper
  Add more tests for subgroups feature
  Large features by the 1st, small ones by the 3rd
  Ask people to create EE MRs on the 7th
  fix project authorizations migration issue
  ...

1 files changed, 6 insertions, 1 deletions

diff --git a/app/models/project.rb b/app/models/project.rb
index 3d3a42ba0af..f68714d09f8 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -350,10 +350,15 @@ class Project < ActiveRecord::Base
     end
 
     def sort(method)
-      if method == 'storage_size_desc'
+      case method.to_s
+      when 'storage_size_desc'
         # storage_size is a joined column so we need to
         # pass a string to avoid AR adding the table name
         reorder('project_statistics.storage_size DESC, projects.id DESC')
+      when 'latest_activity_desc'
+        reorder(last_activity_at: :desc)
+      when 'latest_activity_asc'
+        reorder(last_activity_at: :asc)
       else
         order_by(method)
       end