diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-10-14 22:57:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-14 22:57:41 +0200 |
| commit | b6f24ef0fb8b594c38c29090518c21af051b63b7 (patch) | |
| tree | 5cec6a6b13dfd062848c74ae8e041c589ae40d00 /app/validators | |
| parent | ebf2c3195615bb524f6908e84f99887c8775cbc3 (diff) | |
| parent | 6964952d5f242ca936de9df361185b3e70a99ca4 (diff) | |
Merge pull request #1622 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/validators')
| -rw-r--r-- | app/validators/reaction_validator.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/validators/reaction_validator.rb b/app/validators/reaction_validator.rb index 494b6041b..4ed3376e8 100644 --- a/app/validators/reaction_validator.rb +++ b/app/validators/reaction_validator.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class ReactionValidator < ActiveModel::Validator - SUPPORTED_EMOJIS = Oj.load(File.read(Rails.root.join('app', 'javascript', 'mastodon', 'features', 'emoji', 'emoji_map.json'))).keys.freeze + SUPPORTED_EMOJIS = Oj.load_file(Rails.root.join('app', 'javascript', 'mastodon', 'features', 'emoji', 'emoji_map.json').to_s).keys.freeze LIMIT = 8 |