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 9abb227250 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes.		5 years ago
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
fabricators	Add announcements (#12662)	5 years ago
features	Add submit button to the top of preferences pages (#13068)	5 years ago
fixtures	…
helpers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
lib	Fix tests	5 years ago
mailers	…
models	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
policies	…
presenters	…
requests	Fix localization test failing due to order of locale definitions (#12393)	5 years ago
routing	…
serializers/activitypub	…
services	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
support	Fix base64-encoded file uploads not being possible (#12748)	5 years ago
validators	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
views	…
workers	Fix RefollowWorker not keeping show_reblogs setting (#12707)	5 years ago
rails_helper.rb	Bump sidekiq from 5.2.7 to 6.0.4 (#11727)	5 years ago
spec_helper.rb	Move rspec examples to tmp dir (#12539)	5 years ago