diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-09-01 16:52:37 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-09-01 17:02:18 +0200 |
commit | 3fefb7909ba55d0c8d82a4bf711aac0668a3a38c (patch) | |
tree | b77f9cb09791fbe92cc3a93d1b08c39ee383c843 /app/lib/entity_cache.rb | |
parent | d95dd3883e0c7d1626f5e3b88d24af2627a641e2 (diff) | |
parent | 79305428a7c2bda311bc9d367a84acc28f569522 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `config/webpack/shared.js`: Upstream has changed how Tesseract.js gets included and dropped a dependency. The conflict is caused by glitch-soc having different code due to its theming system. Ported upstream changes. - `lib/mastodon/version.rb`: Upstream refactor/code style change in a place we replaced upstream's repo URL with ours. Ported upstram changes, keeping our repo URL. - `yarn.lock`: Upstream dropped dependencies, one of which was textually too close to a glitch-soc-specific dependency. Not a real conflict.
Diffstat (limited to 'app/lib/entity_cache.rb')
-rw-r--r-- | app/lib/entity_cache.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/entity_cache.rb b/app/lib/entity_cache.rb index afdbd70f2..89cbf8d2c 100644 --- a/app/lib/entity_cache.rb +++ b/app/lib/entity_cache.rb @@ -16,7 +16,7 @@ class EntityCache end def emoji(shortcodes, domain) - shortcodes = [shortcodes] unless shortcodes.is_a?(Array) + shortcodes = Array(shortcodes) cached = Rails.cache.read_multi(*shortcodes.map { |shortcode| to_key(:emoji, shortcode, domain) }) uncached_ids = [] |