You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 8e04ac45be Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Not a real conflict, just upstream getting rid of unused constants too close to glitch-soc-specific contents. Removed unused constants like upstream did. - `app/models/trends.rb`: Conflict because glitch-soc disabled email notifications for trending links. Upstream has refactored this quite a bit and added trending posts. Took upstream code, but disabling the extra trending stuff will come in another commit. - `app/views/admin/trends/links/index.html.haml`: Conflict due to glitch-soc's theming system. Ported upstream changes accordingly.		3 years ago
..
trends	Add appeals (#17364)	3 years ago
account_moderation_notes_helper.rb	Add appeals (#17364)	3 years ago
action_logs_helper.rb	Add appeals (#17364)	3 years ago
announcements_helper.rb	Add announcements (#12662)	5 years ago
dashboard_helper.rb	Fix admin interface crash when displaying deleted user (#17301)	3 years ago
filter_helper.rb	Add trending statuses (#17431)	3 years ago
settings_helper.rb	Add optional hCaptcha support	3 years ago