merge master into issue_3359_3

1 files changed, 4 insertions, 4 deletions

diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index f65f9da3f9e..a04bf7df722 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -74,6 +74,10 @@ class GroupsController < Groups::ApplicationController
   def edit
   end
 
+  def projects
+    @projects = @group.projects.page(params[:page])
+  end
+
   def update
     if Groups::UpdateService.new(@group, current_user, group_params).execute
       redirect_to edit_group_path(@group), notice: "Group '#{@group.name}' was successfully updated."
@@ -100,10 +104,6 @@ class GroupsController < Groups::ApplicationController
     @shared_projects = GroupProjectsFinder.new(group, only_shared: true).execute(current_user)
   end
 
-  def projects
-    @projects = @group.projects.page(params[:page])
-  end
-
   def authorize_create_group!
     unless can?(current_user, :create_group, nil)
       return render_404