Download as
Browse Code »

Commit a7b572d0ab4861110100b54abcc863a312dcefaa

Authored by Dmitriy Zaporozhets
1 parent 8fe58ed5
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fixed #2333

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/controllers/groups_controller.rb
  Diff comments   View file @a7b572d
... ... @@ -21,7 +21,7 @@ class GroupsController < ApplicationController
21 21  
22 22 # Get authored or assigned open merge requests
23 23 def merge_requests
24   - @merge_requests = current_user.cared_merge_requests
  24 + @merge_requests = current_user.cared_merge_requests.opened
25 25 @merge_requests = @merge_requests.of_group(@group).recent.page(params[:page]).per(20)
26 26 end
27 27  
... ...
app/roles/account.rb
  Diff comments   View file @a7b572d
... ... @@ -47,7 +47,7 @@ module Account
47 47 end
48 48  
49 49 def cared_merge_requests
50   - MergeRequest.where("author_id = :id or assignee_id = :id", id: self.id).opened
  50 + MergeRequest.where("author_id = :id or assignee_id = :id", id: self.id)
51 51 end
52 52  
53 53 def project_ids
... ...