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 9558de3b67 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream removed a dependency that was textually close to a glitch-soc-only dependency. Removed the dependency as upstream did, while keeping the glitch-soc-only dependency.		2 years ago
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
admin	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
api	Fix most rubocop issues (#2165)	2 years ago
auth	Fix most rubocop issues (#2165)	2 years ago
concerns	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
disputes	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
filters	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
oauth	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
settings	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
well_known	Remove Keybase integration (#17045)	3 years ago
about_controller.rb	Change public accounts pages to mount the web UI (#19319)	2 years ago
accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
application_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
authorize_interactions_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
backups_controller.rb	Fix user archive takeouts when using OpenStack Swift (#24431)	2 years ago
custom_css_controller.rb	Add customizable user roles (#18641)	2 years ago
emojis_controller.rb	Add (back) rails-level JSON caching (#11333)	5 years ago
filters_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
follower_accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
following_accounts_controller.rb	Fix single name variables on controller folder (#20092)	2 years ago
health_controller.rb	Change health check (#15988)	4 years ago
home_controller.rb	Change public accounts pages to mount the web UI (#19319)	2 years ago
instance_actors_controller.rb	Fix instance actor not being dereferenceable (#17457)	3 years ago
intents_controller.rb	Refactor controllers for statuses, accounts, and more (#11249)	5 years ago
invites_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
manifests_controller.rb	Fix redirecting non-functional accounts on public pages (#11978)	5 years ago
media_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
media_proxy_controller.rb	Add allow_other_host in redirects which may go outside app (#24252)	2 years ago
privacy_controller.rb	Change public accounts pages to mount the web UI (#19319)	2 years ago
relationships_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years 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 branch 'main' into glitch-soc/merge-upstream	2 years ago
tags_controller.rb	Autofix Rubocop Style/TrailingCommaInArguments (#23694)	2 years ago