Claire c85616ee3a Merge commit 'f79b96a5ef0f6c4f57eee7f44ce2579b28a22098' into glitch-soc/merge-upstream ...

Conflicts:
- `app/lib/feed_manager.rb`:
  Not a real conflict, but glitch-soc has an extra `populate_direct_feed` method.
  Added upstream's code.
- `app/models/user_settings.rb`:
  Not a real conflict, glitch-soc has an extra setting textually-adjacent to a
  setting added upstream.
  Added upstream's setting.
- `app/serializers/initial_state_serializer.rb`:
  Same.
- `app/services/precompute_feed_service.rb`:
  Not a real conflict, glitch-soc has extra code for the direct feed.
  Added upstream's new code for populating lists.

2025-02-01 19:07:13 +01:00

..

aliases

Use material symbols in table link helper (#31359)

2024-08-20 11:48:15 +00:00

applications

Clean up labels on development application form (#32116)

2024-10-02 14:45:12 +00:00

deletes

Fix style for hashes (#20518)

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

exports

Fix recently-broken admin interface buttons (#32240)

2024-10-03 16:12:15 +00:00

featured_tags

Use material symbols in table link helper (#31359)

2024-08-20 11:48:15 +00:00

flavours

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

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

imports

Pluralize csv imports (#27094)

2024-10-04 08:19:01 +00:00

login_activities

Replace more font-awesome icons in views/settings (#30963)

2024-08-07 22:52:35 +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 'f79b96a5ef0f6c4f57eee7f44ce2579b28a22098' into glitch-soc/merge-upstream

2025-02-01 19:07:13 +01:00

privacy

Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream

2024-10-06 16:07:58 +02:00

profiles

Change avatar and header size limits from 2MB to 8MB when using libvips (#33002)

2024-11-26 21:01:52 +00:00

shared

Avoid id duplication conflict with main navigation from settings profile link (#32181)

2024-10-01 08:23:05 +00:00

two_factor_authentication

Merge commit '3dcf5e12b1ffb8e57a7c1e1f3f1145c9bae477e8' into glitch-soc/merge-upstream

2025-01-21 19:23:25 +01:00

two_factor_authentication_methods

Change design of edit media modal in web UI (#33516)

2025-01-21 11:34:22 +00:00

verifications

Fix missing button styles on some forms (#33771)

2025-01-29 10:36:24 +00:00