Commit a7b572d0 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fixed #2333

parent 8fe58ed5
...@@ -21,7 +21,7 @@ class GroupsController < ApplicationController ...@@ -21,7 +21,7 @@ class GroupsController < ApplicationController
# Get authored or assigned open merge requests # Get authored or assigned open merge requests
def 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) @merge_requests = @merge_requests.of_group(@group).recent.page(params[:page]).per(20)
end end
......
...@@ -47,7 +47,7 @@ module Account ...@@ -47,7 +47,7 @@ module Account
end end
def cared_merge_requests 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 end
def project_ids def project_ids
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment