Claire 2810231180 Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Upstream renamed a helper method everywhere.
  There was one glitch-soc line involving changes because of the local-only post
  feature.
  Ported upstream's change.

2024-05-16 19:30:10 +02: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

Fix: Mark redirect uris field in Development > Application form as required (#30311)

2024-05-16 07:59:46 +00: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

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

Fix style for hashes (#20518)

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

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 'd97d31cce664281d868e4c661451687a301c97c8' into glitch-soc/merge-upstream

2024-05-04 16:12:51 +02: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