diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2020-01-04 01:54:07 +0100 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2020-02-21 02:34:04 -0600 |
| commit | e46051ca94690782ca24741a570f2051296cd2d5 (patch) | |
| tree | f16b80b68fa0975e2acd73862bfdceed9a63c95d /app/controllers/admin/custom_emojis_controller.rb | |
| parent | 90f2752375145432747c559e0d44e0c86b2eef53 (diff) | |
port tootsuite#12748 to monsterfork: Fix base64-encoded file uploads not being possible
Fix #3804, Fix #5776
Diffstat (limited to 'app/controllers/admin/custom_emojis_controller.rb')
| -rw-r--r-- | app/controllers/admin/custom_emojis_controller.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/app/controllers/admin/custom_emojis_controller.rb b/app/controllers/admin/custom_emojis_controller.rb index f77699166..d61bafdf0 100644 --- a/app/controllers/admin/custom_emojis_controller.rb +++ b/app/controllers/admin/custom_emojis_controller.rb @@ -5,9 +5,6 @@ module Admin before_action :set_custom_emoji, except: [:index, :new, :create] before_action :set_filter_params - include ObfuscateFilename - obfuscate_filename [:custom_emoji, :image] - def index authorize :custom_emoji, :index? @custom_emojis = filtered_custom_emojis.eager_load(:local_counterpart).page(params[:page]) |