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 c1c514ca70 Merge branch 'master' into glitch-soc/merge-upstream ... Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.		6 years ago
..
activitypub	Better pagination for ActivityPub outbox (#7356)	7 years ago
admin	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
api	Merge branch 'master' into glitch-soc/tentative-merge	6 years ago
auth	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
concerns	Redesign public profiles and toots (#8068)	6 years ago
oauth	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
settings	Migrate glitch-soc keyword mutes to Mastodon's	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/merge-upstream	6 years ago
application_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
authorize_follows_controller.rb	…
emojis_controller.rb	…
filters_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
follower_accounts_controller.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
following_accounts_controller.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
home_controller.rb	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
intents_controller.rb	Add tests for intents_controller (#7763)	7 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	Raise Mastodon::RaceConditionError if Redis lock failed (#7511)	7 years ago
remote_follow_controller.rb	Merge branch 'master' into glitch-soc/tentative-merge	6 years ago
remote_unfollows_controller.rb	Add tests for remote_unfollows_controller (#7879)	6 years ago
shares_controller.rb	Merge branch 'master' into glitch-soc/merge	7 years ago
statuses_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
stream_entries_controller.rb	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
tags_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago