Claire 6204d13a2e Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream ...

Conflicts:
- `Gemfile`:
  There was an extra newline in glitch-soc for some reason.
  Removed it.

2024-05-01 19:38:34 +02:00

..

aliases

…

applications

Fix LineLength haml-lint in app/views/settings area (#28663)

2024-01-09 15:28:56 +00:00

deletes

…

exports

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

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

featured_tags

Clean up settings/featured_tags/index view (#28688)

2024-01-11 10:45:26 +00:00

flavours

Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream

2024-01-17 18:32:15 +01:00

imports

Use enum-generated scopes/queries for BulkImport (#29975)

2024-04-18 10:13:35 +00:00

login_activities

Refactor login activity partial (remove inline ruby) (#28687)

2024-01-11 10:36:27 +00:00

migration/redirects

Fix LineLength haml-lint in app/views/settings area (#28663)

2024-01-09 15:28:56 +00:00

migrations

…

preferences

Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream

2024-04-06 21:01:40 +02:00

privacy

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

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

profiles

Merge commit '36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e' into glitch-soc/merge-upstream

2024-01-11 13:17:13 +01:00

shared

Add privacy tab in profile settings (#26484)

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

two_factor_authentication

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02: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