summaryrefslogtreecommitdiff
path: root/app/controllers/dashboard_controller.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-25 18:15:11 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-25 18:15:11 +0200
commit0f473674920dfc6759ddf131b32eb0b4b06256d0 (patch)
tree3247465f8debee5bc48dd2e52ce062266e03c3f4 /app/controllers/dashboard_controller.rb
parentffce379a67624d832ec6aec238f8f7d23c6aefcd (diff)
downloadgitlab-ce-0f473674920dfc6759ddf131b32eb0b4b06256d0.tar.gz
Fix mr preload assoc
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/controllers/dashboard_controller.rb')
-rw-r--r--app/controllers/dashboard_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index d010801149b..e7edaed1272 100644
--- 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