Claire 9f92b05bd2 Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream ...

Conflicts:
- `README.md`:
  Upstream has updated their README but we have a completely different one.
  Kept our version of `README.md`

2023-12-10 18:05:02 +01:00

..

aliases

Fix IDN domains not being rendered correctly in a few left-over places (#17848)

2022-03-22 10:07:11 +01:00

applications

Update haml-lint 0.49.1 (#26118)

2023-07-23 17:48:16 +02:00

deletes

Fix style for hashes (#20518)

2022-11-17 11:05:39 +01:00

exports

Issue 26048: swap "muting" and "blocking" list options in settings -> Data Exports (#26088)

2023-10-26 14:08:25 +00:00

featured_tags

Change edit profile page (#25413)

2023-06-14 04:38:07 +02:00

flavours

Fix glitch-soc HAML linting issues (#2166)

2023-04-07 20:55:28 +02:00

imports

Fix haml-lint Rubocop Style/StringLiterals cop (#25948)

2023-07-17 16:57:18 +02:00

login_activities

Fix haml-lint ConsecutiveSilentScripts rule (#26043)

2023-07-18 09:25:37 +02:00

migration/redirects

Fix style for hashes (#20518)

2022-11-17 11:05:39 +01:00

migrations

Fix style for hashes (#20518)

2022-11-17 11:05:39 +01:00

preferences

Fix HAML linting issues

2023-10-24 20:53:58 +02:00

privacy

Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream

2023-09-02 11:41:40 +02:00

profiles

Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream

2023-08-24 21:01:19 +02:00

shared

Add privacy tab in profile settings (#26484)

2023-08-14 18:52:45 +02:00

two_factor_authentication

Merge branch 'main' into glitch-soc/merge-upstream

2022-11-17 12:01:37 +01:00

two_factor_authentication_methods

Fix haml-lint UnnecessaryStringOutput for views (#27531)

2023-10-25 12:01:00 +00:00

verifications

Change edit profile page (#25413)

2023-06-14 04:38:07 +02:00