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 dcded13a99 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.		6 years ago
..
activitypub	…
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	Improve signature verification safeguards (#8959)	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	…
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/master	6 years ago
application_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
authorize_interactions_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
custom_css_controller.rb	Add admin custom CSS setting (#8399)	6 years ago
emojis_controller.rb	Unuse ActiveRecord::Base#cache_key (#8185)	6 years ago
filters_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
follower_accounts_controller.rb	…
following_accounts_controller.rb	…
home_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
intents_controller.rb	Add remote interaction dialog for toots (#8202)	6 years ago
invites_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
manifests_controller.rb	…
media_controller.rb	…
media_proxy_controller.rb	…
remote_follow_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
remote_interaction_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
remote_unfollows_controller.rb	Add tests for remote_unfollows_controller (#7879)	6 years ago
shares_controller.rb	…
statuses_controller.rb	Set Content-Security-Policy rules through RoR's config (#8957)	6 years ago
stream_entries_controller.rb	…
tags_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago