Improve interaction modal error handling (#26795)
Merge pull request #2392 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes into glitch-soc
Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-releases.yml`:
Upstream changed comments close to a line we modified to account for
different container image repositories.
Updated the comments as upstream did.
Add admin notifications for new Mastodon versions (#26582)
Fix search popout including full-text search instructions when full-text search is disabled (#26755)
Add an explanation banner on switching to single column mode (#26019)
Fix bug with reblogged view on Toots only showing latest reblogging accounts (#26574)
Fix bug with favourited view on Toots only showing latest favouriting accounts (#26577)
Add search options to search popout in web UI (#26662)
Merge pull request #2383 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
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)
Fix some React warnings (#26609)