diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-01-20 18:31:11 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-20 18:31:11 +0100 |
| commit | dc2ab6e646bb721ef2e1be268b876bd00e8fa802 (patch) | |
| tree | a828f3968b151924656061bfc709b00565aff877 /app/views/admin/custom_emojis/index.html.haml | |
| parent | eeb8753adc98022a55051d45a137b02a2bff4c23 (diff) | |
| parent | 02063c245c8a2a09e741cbce8302edf3ec14feef (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/packs/public.js`: Upstream removed an unused function in code that has been refactored a bit. Removed that function in the corresponding places.
Diffstat (limited to 'app/views/admin/custom_emojis/index.html.haml')
| -rw-r--r-- | app/views/admin/custom_emojis/index.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/admin/custom_emojis/index.html.haml b/app/views/admin/custom_emojis/index.html.haml index dc9ebf507..d3705a36e 100644 --- a/app/views/admin/custom_emojis/index.html.haml +++ b/app/views/admin/custom_emojis/index.html.haml @@ -22,7 +22,7 @@ = form_tag admin_custom_emojis_url, method: 'GET', class: 'simple_form' do .fields-group - - Admin::FilterHelper::CUSTOM_EMOJI_FILTERS.each do |key| + - CustomEmojiFilter::KEYS.each do |key| = hidden_field_tag key, params[key] if params[key].present? - %i(shortcode by_domain).each do |key| @@ -36,7 +36,7 @@ = form_for(@form, url: batch_admin_custom_emojis_path) do |f| = hidden_field_tag :page, params[:page] || 1 - - Admin::FilterHelper::CUSTOM_EMOJI_FILTERS.each do |key| + - CustomEmojiFilter::KEYS.each do |key| = hidden_field_tag key, params[key] if params[key].present? .batch-table |