Fix mr preload assoc

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fix mr preload assoc
0f473674 · Dmitriy Zaporozhets · ffce379a · 0f473674 · 0f473674
Unverified Commit 0f473674 authored Feb 25, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

dashboard_controller.rb app/controllers/dashboard_controller.rb +1 -1

groups_controller.rb app/controllers/groups_controller.rb +1 -1

No files found.
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -55,7 +55,7 @@ class DashboardController < ApplicationController
  def merge_requests
    @merge_requests = FilteringService.new.execute(MergeRequest, current_user, params)
    @merge_requests = @merge_requests.page(params[:page]).per(20)
-    @merge_requests = @merge_requests.preload(:author, :project)
+    @merge_requests = @merge_requests.preload(:author, :target_project)
  end

  def issues

--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -49,7 +49,7 @@ class GroupsController < ApplicationController
  def merge_requests
    @merge_requests = FilteringService.new.execute(MergeRequest, current_user, params)
    @merge_requests = @merge_requests.page(params[:page]).per(20)
-    @merge_requests = @merge_requests.preload(:author, :project)
+    @merge_requests = @merge_requests.preload(:author, :target_project)
  end

  def issues