Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream
Conflicts:
- `db/schema.rb`:
Upstream regenerated the schema file using Rails 7, the conflicts are
caused by our extra columns.
Applied upstream's changes, but keeping our extra columns.
Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream fixed an issue that was not present in glitch-soc.
Kept our version.
Revert poll colors to green outside of compose form (#26164)
fix poll input active style (#26162)
Add published date and author to news on the explore screen in web UI (#26155)
Fix missing action label on sensitive videos and embeds in web UI (#26135)
Fix missing border on error screen in light theme in web UI (#26152)
Fix UI Overlap with the loupe icon in the Explore Tab (#26113)
change poll form element colors to fit with the rest of the ui (#26139)
Change design of link previews in web UI (#26136)
Remove 16:9 cropping from web UI (#26132)
Fix focus and hover styles in web UI (#26125)
change focus ui for keyboard only input (#25935)
Merge pull request #2302 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Merge branch 'main' into glitch-soc/merge-upstream
Fix for "follows you" indicator in light web UI not readable (#25993)
Prevent split line between icon and number on reposts & favourites (#26004)
Merge pull request #2296 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes