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.

Claire 3e4b8636a0 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
..
aliases	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	3 years ago
applications	Various fixes and improvements (#12878)	5 years ago
deletes	Fix style for hashes (#20518)	2 years ago
exports	Fix reference to non-existing translation in the exports page. (#15894)	4 years ago
featured_tags	Fix featured tag display name in setting (#19404)	2 years ago
flavours	Fix settings/flavours	6 years ago
imports	Add option to overwrite imported data (#9962)	6 years ago
login_activities	Add full user agent in tooltips for login activities (#16428)	3 years ago
migration/redirects	Fix style for hashes (#20518)	2 years ago
migrations	Fix style for hashes (#20518)	2 years ago
preferences	Add “Glitch-only” label to glitch-specific settings	2 years ago
profiles	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
shared	2FA controller cleanup (#2296)	8 years ago
two_factor_authentication	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
two_factor_authentication_methods	Add WebAuthn as an alternative 2FA method (#14466)	4 years ago