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 656a41db2a Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream has updated its README, we have a completely different one. Kept ours. - `app/views/auth/sessions/two_factor.html.haml`: Upstream refactored stuff and the conflict is because of glitch-soc's theming system. Ported upstream changes while accounting for the different theming system.		1 year ago
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
admin	Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream	1 year ago
api	Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream	1 year ago
auth	Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream	1 year ago
concerns	Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream	1 year ago
disputes	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
filters	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
oauth	Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream	1 year ago
settings	Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream	1 year ago
well_known	Change interaction modal in web UI (#26075)	1 year ago
about_controller.rb	Simplify instance presenter view access (#26046)	1 year ago
accounts_controller.rb	Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream	1 year ago
application_controller.rb	Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream	1 year ago
authorize_interactions_controller.rb	Change interaction modal in web UI (#26075)	1 year ago
backups_controller.rb	Storage: add :azure to remaining callers (#26080)	1 year ago
custom_css_controller.rb	Refactor `Cache-Control` and `Vary` definitions (#24347)	2 years ago
emojis_controller.rb	Refactor `Cache-Control` and `Vary` definitions (#24347)	2 years ago
filters_controller.rb	Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream	2 years ago
follower_accounts_controller.rb	Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream	1 year ago
following_accounts_controller.rb	Fix Vary headers not being set on some redirects (#27272)	1 year ago
health_controller.rb	Change health check (#15988)	4 years ago
home_controller.rb	Simplify instance presenter view access (#26046)	1 year ago
instance_actors_controller.rb	Fix /actor needlessly reading session cookie and varying on Signature (#24664)	2 years ago
intents_controller.rb	Fix Performance/DeletePrefix cop (#24796)	2 years ago
invites_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
mail_subscriptions_controller.rb	Add List-Unsubscribe email header (#26085)	1 year ago
manifests_controller.rb	Fix some user-independent endpoints potentially reading session cookies (#24650)	2 years ago
media_controller.rb	Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream	1 year ago
media_proxy_controller.rb	Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252)	1 year ago
privacy_controller.rb	Simplify instance presenter view access (#26046)	1 year ago
relationships_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
remote_interaction_helper_controller.rb	Change interaction modal in web UI (#26075)	1 year ago
shares_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
statuses_cleanup_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
statuses_controller.rb	Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream	1 year ago
tags_controller.rb	Simplify instance presenter view access (#26046)	1 year ago