diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index 8f204d09af16031365bc891d0a4d32f2ac4d25a2..d010801149b6e1e1d6f45a8edb77bba362f80dab 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -55,12 +55,13 @@ 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) end def issues @issues = FilteringService.new.execute(Issue, current_user, params) @issues = @issues.page(params[:page]).per(20) - @issues = @issues.includes(:author, :project) + @issues = @issues.preload(:author, :project) respond_to do |format| format.html diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 014ef77e4f1a936d86ffd7c4db86a5d835f65196..151f4cc9b278a5b022af226b22b926c1c08f1bbe 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -49,12 +49,13 @@ 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) end def issues @issues = FilteringService.new.execute(Issue, current_user, params) @issues = @issues.page(params[:page]).per(20) - @issues = @issues.includes(:author, :project) + @issues = @issues.preload(:author, :project) respond_to do |format| format.html