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	…
admin	Add missing tests for admin/accounts_controller (#7791)	6 years ago
api	Merge branch 'master' into glitch-soc/tentative-merge	6 years ago
auth	Add missing tests for confirmations controller (#7866)	6 years ago
concerns	…
oauth	…
settings	Migrate glitch-soc keyword mutes to Mastodon's	6 years ago
well_known	…
about_controller_spec.rb	Compensate for scrollbar disappearing when media modal visible (#8100)	6 years ago
account_follow_controller_spec.rb	…
account_unfollow_controller_spec.rb	…
accounts_controller_spec.rb	…
application_controller_spec.rb	…
authorize_follows_controller_spec.rb	…
emojis_controller_spec.rb	…
follower_accounts_controller_spec.rb	Add tests for followers_accounts_controller (#7794)	6 years ago
following_accounts_controller_spec.rb	Add tests for following accounts controller (#7800)	6 years ago
home_controller_spec.rb	…
intents_controller_spec.rb	Add tests for intents_controller (#7763)	6 years ago
invites_controller_spec.rb	…
manifests_controller_spec.rb	…
media_controller_spec.rb	…
remote_follow_controller_spec.rb	…
remote_unfollows_controller_spec.rb	Add tests for remote_unfollows_controller (#7879)	6 years ago
shares_controller_spec.rb	Add tests for shares_controller (#7835)	6 years ago
statuses_controller_spec.rb	…
stream_entries_controller_spec.rb	…
tags_controller_spec.rb	…