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.

Claire aec61a703f Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream changed how docker images were built, including how they were cached. I don't know much about it, so applied upstream's changes. - `app/controllers/admin/domain_blocks_controller.rb`: The feature, that was in glitch-soc, got backported upstream. It also had a few fixes upstream, so those have been ported! - `app/javascript/packs/admin.js`: Glitch-soc changes have been backported upstream. As a result, some code from `app/javascript/core/admin.js` got added upstream. Kept our version since our shared Javascript already has that feature. - `app/models/user.rb`: Upstream added something to distinguish unusable and unusable-because-moved accounts, while glitch-soc considers moved accounts usable. Took upstream's code for `functional_or_moved?` and made `functional?` call it. - `app/views/statuses/_simple_status.html.haml`: Upstream cleaned up code style a bit, on a line that we had custom changes for. Applied upstream's change while keeping our change. - `config/initializers/content_security_policy.rb`: Upstream adopted one CSP directive we already had. The conflict is because of our files being structurally different, but the change itself was already part of glitch-soc. Kept our version.		2 years ago
..
config/initializers	Fix rate limiting for paths with formats (#20675)	2 years ago
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
fabricators	png optimization(loss less) (#19630)	2 years ago
features	Change public accounts pages to mount the web UI (#19319)	2 years ago
fixtures	Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597)	2 years ago
helpers	Test the native_locale_name of a non-standard locale (#20284)	2 years ago
lib	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
mailers	Add support for language preferences for trending statuses and links (#18288)	2 years ago
models	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
policies	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
presenters	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
requests	Change public accounts pages to mount the web UI (#19319)	2 years ago
routing	Change public accounts pages to mount the web UI (#19319)	2 years ago
serializers/activitypub	…
services	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
support	…
validators	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
views/statuses	Fix style for hashes (#20518)	2 years ago
workers	Fix followers count not being updated when migrating follows (#19998)	2 years ago
rails_helper.rb	…
spec_helper.rb	…