Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc2

1 files changed, 13 insertions, 0 deletions

diff --git a/app/controllers/groups/application_controller.rb b/app/controllers/groups/application_controller.rb
index 9c2e361e92f..a504d2ce991 100644
--- a/app/controllers/groups/application_controller.rb
+++ b/app/controllers/groups/application_controller.rb
@@ -3,11 +3,14 @@
 class Groups::ApplicationController < ApplicationController
   include RoutableActions
   include ControllerWithCrossProjectAccessCheck
+  include SortingHelper
+  include SortingPreference
 
   layout 'group'
 
   skip_before_action :authenticate_user!
   before_action :group
+  before_action :set_sorting
   requires_cross_project_access
 
   private
@@ -57,6 +60,16 @@ class Groups::ApplicationController < ApplicationController
 
     url_for(safe_params)
   end
+
+  def set_sorting
+    if has_project_list?
+      @group_projects_sort = set_sort_order(Project::SORTING_PREFERENCE_FIELD, sort_value_name)
+    end
+  end
+
+  def has_project_list?
+    false
+  end
 end
 
 Groups::ApplicationController.prepend_if_ee('EE::Groups::ApplicationController')