You cannot 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”.		8 years ago
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	8 years ago
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	8 years ago
features	…
fixtures	Slightly reduce RAM usage (#7301)	8 years ago
helpers	Merge branch 'master' into glitch-soc/merge-upstream	8 years ago
lib	Merge branch 'master' into glitch-soc/merge-upstream	8 years ago
mailers	Account archive download (#6460)	8 years ago
models	Merge branch 'master' into glitch-soc/merge-upstream	8 years ago
policies	Add test to disallow remote users from fetching local-only toots	8 years ago
presenters	Isolate each specs for cache store (#6450)	8 years ago
requests	Use raw status code on have_http_status (#7214)	8 years ago
routing	…
services	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
support	…
validators	Merge remote-tracking branch 'origin/master' into gs-master	8 years ago
views	Merge branch 'master' into glitch-soc/merge-upstream	8 years ago
workers	…
rails_helper.rb	Slightly reduce RAM usage (#7301)	8 years ago
spec_helper.rb	Disable simplecov on CircleCI (#7416)	8 years ago