From a7b572d0ab4861110100b54abcc863a312dcefaa Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sat, 22 Dec 2012 11:59:05 +0200 Subject: [PATCH] Fixed #2333 --- app/controllers/groups_controller.rb | 2 +- app/roles/account.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 0aecd9c6..c82edb4c 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 diff --git a/app/roles/account.rb b/app/roles/account.rb index 72fa9ebf..ede12b60 100644 --- a/app/roles/account.rb +++ b/app/roles/account.rb @@ -47,7 +47,7 @@ module Account end def cared_merge_requests - MergeRequest.where("author_id = :id or assignee_id = :id", id: self.id).opened + MergeRequest.where("author_id = :id or assignee_id = :id", id: self.id) end def project_ids