diff options
| author | Ondřej Hruška <ondra@ondrovo.com> | 2017-09-28 09:18:35 +0200 |
|---|---|---|
| committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-09-28 09:18:35 +0200 |
| commit | 83bda6c1a813c5aeb131b18a0500fed0c07fa9c2 (patch) | |
| tree | 32f197901b4b16ea7f94de682fee6cdc44686045 /app/controllers/admin/custom_emojis_controller.rb | |
| parent | fcf0d2078ea813e0dd318fa154d620018e7b7bcf (diff) | |
| parent | b9f59ebcc68e9da0a7158741a1a2ef3564e1321e (diff) | |
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream
Diffstat (limited to 'app/controllers/admin/custom_emojis_controller.rb')
| -rw-r--r-- | app/controllers/admin/custom_emojis_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/custom_emojis_controller.rb b/app/controllers/admin/custom_emojis_controller.rb index 572ad1ac2..d70514d9a 100644 --- a/app/controllers/admin/custom_emojis_controller.rb +++ b/app/controllers/admin/custom_emojis_controller.rb @@ -3,7 +3,7 @@ module Admin class CustomEmojisController < BaseController def index - @custom_emojis = CustomEmoji.where(domain: nil) + @custom_emojis = CustomEmoji.local end def new |