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 941a9df28a Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-nightly.yml`: Upstream changed how the nightly builds are versioned, the conflict is because glitch-soc modified adjacent lines relative to the docker repositories the images are pushed to. Applied upstream's changes. - `app/views/settings/preferences/notifications/show.html.haml`: Upstream moved some settings around. Glitch-soc had more settings. Applied upstream's changes, moving glitch-soc's extra settings accordingly.		1 year ago
..
aliases	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	3 years ago
applications	Update haml-lint 0.49.1 (#26118)	1 year ago
deletes	Fix style for hashes (#20518)	2 years ago
exports	Change user backups to use expiring URLs for download when possible (#24136)	2 years ago
featured_tags	Change edit profile page (#25413)	1 year ago
flavours	Fix glitch-soc HAML linting issues (#2166)	2 years ago
imports	Fix haml-lint Rubocop `Style/StringLiterals` cop (#25948)	1 year ago
login_activities	Fix haml-lint `ConsecutiveSilentScripts` rule (#26043)	1 year ago
migration/redirects	Fix style for hashes (#20518)	2 years ago
migrations	Fix style for hashes (#20518)	2 years ago
preferences	Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream	1 year ago
privacy	Move glitch-soc's “Hide followers count” setting to “Show followers count” under “Privacy and reach” tab	1 year ago
profiles	Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream	1 year ago
shared	Add privacy tab in profile settings (#26484)	1 year 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
verifications	Change edit profile page (#25413)	1 year ago