diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-25 18:15:11 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-25 18:15:11 +0200 |
| commit | 0f473674920dfc6759ddf131b32eb0b4b06256d0 (patch) | |
| tree | 3247465f8debee5bc48dd2e52ce062266e03c3f4 /app | |
| parent | ffce379a67624d832ec6aec238f8f7d23c6aefcd (diff) | |
| download | gitlab-ce-0f473674920dfc6759ddf131b32eb0b4b06256d0.tar.gz | |
Fix mr preload assoc
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/dashboard_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/groups_controller.rb | 2 |
2 files changed, 2 insertions, 2 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 diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 151f4cc9b27..a9dce2f6b13 100644 --- 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 |