deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed #2333

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-12-22 11:59:05 +02:00
parent 8fe58ed541
commit a7b572d0ab
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/groups_controller.rb
View file

@ -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

2
app/roles/account.rb
View file

@ -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