Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 00:38:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `tsconfig.json`:
  Upstream made style fixes, while glitch-soc had extra options.
  Ported upstream's style fixes.
This commit is contained in:
Claire
2024-01-24 20:42:53 +01:00
parent 634acd07c4 01ce9df880
commit 22cfab0ebf
63 changed files with 291 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/v2/filters_controller.rb
View File

@@ -35,7 +35,7 @@ class Api::V2::FiltersController < Api::BaseController
private
def set_filters
@filters = current_account.custom_filters.includes(:keywords)
@filters = current_account.custom_filters.includes(:keywords, :statuses)
end
def set_filter