Claire b6b6e142ba Merge commit '918563704f5ff5eeb1efa31a412ac38f97781e9e' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream modified `theme_color_tags` to work on color scheme rather than theme.
  Updated it as well.
- `app/views/layouts/embedded.html.haml`:
  Upstream changed the embed theme from `mastodon-light` to `system`.
  Glitch-soc doesn't use a hardcoded value, so ignore the change.
- `spec/helpers/theme_helper_spec.rb`:
  Accomodate `theme_color_tags` changes.

2026-01-16 22:28:08 +01:00

..

migrate

Merge commit '918563704f5ff5eeb1efa31a412ac38f97781e9e' into glitch-soc/merge-upstream

2026-01-16 22:28:08 +01:00

post_migrate

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

2025-06-25 19:29:09 +02:00

seeds

Add ability to block words in usernames (#35407)

2025-07-29 10:19:15 +00:00

views

Change follow recommendation materialized view to be faster in most cases (#26545)

2023-08-18 18:20:55 +02:00

schema.rb

Merge commit '918563704f5ff5eeb1efa31a412ac38f97781e9e' into glitch-soc/merge-upstream

2026-01-16 22:28:08 +01:00

seeds.rb

Fix Rails/RootPathnameMethods cop (#31582)

2024-08-26 07:35:07 +00:00