From c26ba890bd18404d1bde980854c9c16fd42c3f1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Fri, 4 Aug 2017 17:04:59 +0200
Subject: [PATCH] prevent N+1 when loading custom emojis

---
 app/models/emoji.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/emoji.rb b/app/models/emoji.rb
index c6f2e490cfc..368b7a37fa3 100644
--- a/app/models/emoji.rb
+++ b/app/models/emoji.rb
@@ -84,7 +84,7 @@ class Emoji
   def self.load_custom
     result = []
 
-    CustomEmoji.order(:name).all.each do |emoji|
+    CustomEmoji.includes(:upload).order(:name).find_each do |emoji|
       result << Emoji.new.tap do |e|
         e.name = emoji.name
         e.url = emoji.upload&.url