diff options
Diffstat (limited to 'app/controllers/groups_controller.rb')
| -rw-r--r-- | app/controllers/groups_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 93c495363d9..c82edb4c168 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -21,7 +21,7 @@ class GroupsController < ApplicationController # Get authored or assigned open merge requests def merge_requests - @merge_requests = current_user.cared_merge_requests + @merge_requests = current_user.cared_merge_requests.opened @merge_requests = @merge_requests.of_group(@group).recent.page(params[:page]).per(20) end @@ -49,6 +49,7 @@ class GroupsController < ApplicationController def people @project = group.projects.find(params[:project_id]) if params[:project_id] @users = @project ? @project.users : group.users + @users.sort_by!(&:name) if @project @team_member = @project.users_projects.new |