Claire f224237862 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `db/schema.rb`: Conflict due to glitch-soc adding the `content_type` column on status edits and thus having a different schema version number. Solved by taking upstream's schema version number, as it is higher than glitch-soc's.		2022-02-17 10:58:44 +01:00
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-08 18:23:53 +01:00
admin	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-17 10:58:44 +01:00
api	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-12 11:12:41 +01:00
auth	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-17 10:58:44 +01:00
concerns	Add support for multiple source files per pack	2022-02-12 00:10:28 +01:00
disputes	Fix issues when attempting to appeal an old strike (#17554)	2022-02-16 22:29:48 +01:00
oauth
settings
well_known
about_controller.rb	Change CAPTCHA handling to be only on email verification	2022-01-25 23:56:57 +01:00
account_follow_controller.rb
account_unfollow_controller.rb
accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-17 08:28:52 +01:00
application_controller.rb	Move glitch-soc-specific theming methods to ThemingConcern	2022-02-05 10:58:51 +01:00
authorize_interactions_controller.rb
custom_css_controller.rb
directories_controller.rb
emojis_controller.rb
filters_controller.rb
follower_accounts_controller.rb
following_accounts_controller.rb
health_controller.rb
home_controller.rb
instance_actors_controller.rb	Fix instance actor not being dereferenceable (#17457)	2022-02-06 15:31:03 +01:00
intents_controller.rb
invites_controller.rb
manifests_controller.rb
media_controller.rb
media_proxy_controller.rb
public_timelines_controller.rb
relationships_controller.rb
remote_follow_controller.rb
remote_interaction_controller.rb
shares_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00
statuses_cleanup_controller.rb
statuses_controller.rb
tags_controller.rb