Download as
Browse Code »

Commit a1b9b1d83fc1e81ab6ff9d6593c8a95697e7474a

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

Use rails preload for Dashboard issues, mr 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 2 changed files with 4 additions and 2 deletions   Show diff stats
app/controllers/dashboard_controller.rb
  Diff comments   View file @a1b9b1d
@@ -55,12 +55,13 @@ class DashboardController &lt; ApplicationController @@ -55,12 +55,13 @@ 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 end 59 end
59 60
60 def issues 61 def issues
61 @issues = FilteringService.new.execute(Issue, current_user, params) 62 @issues = FilteringService.new.execute(Issue, current_user, params)
62 @issues = @issues.page(params[:page]).per(20) 63 @issues = @issues.page(params[:page]).per(20)
63 - @issues = @issues.includes(:author, :project) 64 + @issues = @issues.preload(:author, :project)
64 65
65 respond_to do |format| 66 respond_to do |format|
66 format.html 67 format.html
app/controllers/groups_controller.rb
  Diff comments   View file @a1b9b1d
@@ -49,12 +49,13 @@ class GroupsController &lt; ApplicationController @@ -49,12 +49,13 @@ 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 end 53 end
53 54
54 def issues 55 def issues
55 @issues = FilteringService.new.execute(Issue, current_user, params) 56 @issues = FilteringService.new.execute(Issue, current_user, params)
56 @issues = @issues.page(params[:page]).per(20) 57 @issues = @issues.page(params[:page]).per(20)
57 - @issues = @issues.includes(:author, :project) 58 + @issues = @issues.preload(:author, :project)
58 59
59 respond_to do |format| 60 respond_to do |format|
60 format.html 61 format.html