Read about our upcoming Code of Conduct on this issue

This instance will be upgraded to Heptapod 0.28.1 on 2022-01-26 at 16:00 UTC+1 (a few minutes of down time)

Commit 6b9f221a authored by gitlabhq's avatar gitlabhq
Browse files

perfomance fix

parent 3a35bd1ef552
......@@ -19,6 +19,8 @@ def index
else @project.issues.opened
end
@issues = @issues.includes(:author, :project)
respond_to do |format|
format.html # index.html.erb
format.js
......@@ -35,7 +37,7 @@ def edit
end
def show
@notes = @issue.notes.order("created_at DESC").limit(20)
@notes = @issue.notes.inc_author.order("created_at DESC").limit(20)
@note = @project.notes.new(:noteable => @issue)
respond_to do |format|
......
......@@ -30,6 +30,8 @@ class Note < ActiveRecord::Base
scope :last_week, where("created_at >= :date", :date => (Date.today - 7.days))
scope :since, lambda { |day| where("created_at >= :date", :date => (day)) }
scope :fresh, order("created_at DESC")
scope :inc_author_project, includes(:project, :author)
scope :inc_author, includes(:author)
mount_uploader :attachment, AttachmentUploader
end
......
......@@ -74,8 +74,16 @@ def team_member_by_name_or_email(email = nil, name = nil)
users_projects.find_by_user_id(user.id) if user
end
def fresh_issues(n)
issues.includes(:project, :author).order("created_at desc").first(n)
end
def fresh_notes(n)
notes.inc_author_project.order("created_at desc").first(n)
end
def common_notes
notes.where(:noteable_type => ["", nil])
notes.where(:noteable_type => ["", nil]).inc_author_project
end
def build_commit_note(commit)
......@@ -134,8 +142,8 @@ def last_activity_date
def updates(n = 3)
[
fresh_commits(n),
issues.last(n),
notes.fresh.limit(n)
fresh_issues(n),
fresh_notes(n)
].compact.flatten.sort do |x, y|
y.created_at <=> x.created_at
end[0...n]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment