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/controllers/admin/tags_controller.rb | |
| 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/controllers/admin/tags_controller.rb')
| -rw-r--r-- | app/controllers/admin/tags_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/tags_controller.rb b/app/controllers/admin/tags_controller.rb index 65341bbfb..59df4470e 100644 --- a/app/controllers/admin/tags_controller.rb +++ b/app/controllers/admin/tags_controller.rb @@ -73,7 +73,7 @@ module Admin end def filter_params - params.slice(:directory, :reviewed, :unreviewed, :pending_review, :page, :popular, :active, :name).permit(:directory, :reviewed, :unreviewed, :pending_review, :page, :popular, :active, :name) + params.slice(:page, *TagFilter::KEYS).permit(:page, *TagFilter::KEYS) end def tag_params |