Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-nightly.yml`:
Upstream changed how the nightly builds are versioned, the conflict
is because glitch-soc modified adjacent lines relative to the docker
repositories the images are pushed to.
Applied upstream's changes.
- `app/views/settings/preferences/notifications/show.html.haml`:
Upstream moved some settings around. Glitch-soc had more settings.
Applied upstream's changes, moving glitch-soc's extra settings
accordingly.
Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream
Conflicts:
- `Vagrantfile`:
Upstream bumped a bunch of values, including one that was already bumped by
glitch-soc.
Took upstream's version.
- `lib/paperclip/transcoder.rb`:
glitch-soc already had a partial fix for this.
Took upstream's version.
Fix selecting domains to forward reports to not passing the information correctly (#26636)
Change hashtag bar tags to be de-emphasized (#26606)
Fix some React warnings (#26609)
Change the hashtag bar to be hidden when there is a CW and the post is not expanded (#26615)
Better hashtag normalization when processing a post (#26614)
Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
Upstream moved some settings, where glitch-soc has an extra setting.
Ported upstream changes, moving the same settings as them.
Remove hashtags from the last line of a status if it only contains hashtags (#26499)
Fix case-insensitive comparison of hashtags to do case-folding (#26525)
Fix “legal” report category not showing up in moderation interface (#26509)
Fix hashtag bar sometimes including tags that appear in the post's body (#26506)
Add display of out-of-band hashtags in the web interface (#26492)
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Fix unfollow icon styling in advanced column (#26482)