Download as
Browse Code »

Commit 0f473674920dfc6759ddf131b32eb0b4b06256d0

Authored by Dmitriy Zaporozhets
1 parent ffce379a
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Fix mr preload assoc 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/controllers/dashboard_controller.rb
  Diff comments   View file @0f47367
@@ -55,7 +55,7 @@ class DashboardController &lt; ApplicationController @@ -55,7 +55,7 @@ class DashboardController &lt; ApplicationController
55 def merge_requests 55 def merge_requests
56 @merge_requests = FilteringService.new.execute(MergeRequest, current_user, params) 56 @merge_requests = FilteringService.new.execute(MergeRequest, current_user, params)
57 @merge_requests = @merge_requests.page(params[:page]).per(20) 57 @merge_requests = @merge_requests.page(params[:page]).per(20)
58 - @merge_requests = @merge_requests.preload(:author, :project) 58 + @merge_requests = @merge_requests.preload(:author, :target_project)
59 end 59 end
60 60
61 def issues 61 def issues
app/controllers/groups_controller.rb
  Diff comments   View file @0f47367
@@ -49,7 +49,7 @@ class GroupsController &lt; ApplicationController @@ -49,7 +49,7 @@ class GroupsController &lt; ApplicationController
49 def merge_requests 49 def merge_requests
50 @merge_requests = FilteringService.new.execute(MergeRequest, current_user, params) 50 @merge_requests = FilteringService.new.execute(MergeRequest, current_user, params)
51 @merge_requests = @merge_requests.page(params[:page]).per(20) 51 @merge_requests = @merge_requests.page(params[:page]).per(20)
52 - @merge_requests = @merge_requests.preload(:author, :project) 52 + @merge_requests = @merge_requests.preload(:author, :target_project)
53 end 53 end
54 54
55 def issues 55 def issues