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.

Thibaut Girka 12dae9d583 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml		6 years ago
..
activitypub	Ensure request.body isn't emptied out before signature verification (#10432)	6 years ago
admin	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
api	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
auth	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
concerns	Mark the 410 gone response for suspended accounts as cachable (#10339)	6 years ago
oauth	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
well_known	Add Keybase integration (#10297)	6 years ago
about_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
account_follow_controller.rb	…
account_unfollow_controller.rb	…
accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
application_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
authorize_interactions_controller.rb	…
custom_css_controller.rb	…
directories_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
emojis_controller.rb	…
filters_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
follower_accounts_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
following_accounts_controller.rb	…
home_controller.rb	…
intents_controller.rb	…
invites_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
manifests_controller.rb	…
media_controller.rb	fix CSP / X-Frame-Options for media embeds (#9558)	6 years ago
media_proxy_controller.rb	…
public_timelines_controller.rb	[Glitch] Redesign landing page	6 years ago
relationships_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
remote_follow_controller.rb	…
remote_interaction_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
remote_unfollows_controller.rb	…
shares_controller.rb	…
statuses_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
stream_entries_controller.rb	…
tags_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago