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 c790ecb14d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.		4 years ago
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
fabricators	Add announcements (#12662)	4 years ago
features	Add submit button to the top of preferences pages (#13068)	4 years ago
fixtures	Add noopener and/or noreferrer (#12202)	5 years ago
helpers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
lib	Fix tests	4 years ago
mailers	Add password challenge to 2FA settings, e-mail notifications (#11878)	5 years ago
models	Merge branch 'master' into glitch-soc/merge-upstream	4 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	4 years ago
support	Fix base64-encoded file uploads not being possible (#12748)	5 years ago
validators	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
views	…
workers	Fix RefollowWorker not keeping show_reblogs setting (#12707)	5 years ago
rails_helper.rb	Fix records not being indexed sometimes (#12024)	5 years ago
spec_helper.rb	Move rspec examples to tmp dir (#12539)	5 years ago