cybrespace/mastodon
4
3
Fork 3
Code Issues 7 Pull requests Releases Activity

Merge 2.7.3 #8

Merged
chr merged 70 commits from upstream_v2.7.3 into cybrespace 2019-02-24 01:55:42 +01:00
Conversation 0 Commits 70 Files changed 86 +3
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 07fffd226d - Show all commits

3
app/controllers/admin/custom_emojis_controller.rb
View file

@ -5,6 +5,9 @@ module Admin
before_action :set_custom_emoji, except: [:index, :new, :create] before_action :set_custom_emoji, except: [:index, :new, :create]
before_action :set_filter_params before_action :set_filter_params
include ObfuscateFilename
obfuscate_filename [:custom_emoji, :image]
def index def index
authorize :custom_emoji, :index? authorize :custom_emoji, :index?
@custom_emojis = filtered_custom_emojis.eager_load(:local_counterpart).page(params[:page]) @custom_emojis = filtered_custom_emojis.eager_load(:local_counterpart).page(params[:page])