hometown/app/views
Jasmin 3b69a29703
Merge changes of 4.0.7..4.0.10 (#1324)
This includes all changes made in
https://github.com/mastodon/mastodon/releases/tag/v4.0.7 and
https://github.com/mastodon/mastodon/releases/tag/v4.0.8 and therefore
requires:

⚠️ Restart of all Mastodon processes, especially the Streaming
API

There was a conflict during the merge inside the `streaming/index.js`,
which was related to the following snippet:

```js
      // Only send local-only statuses to logged-in users
      if (payload.local_only && !req.accountId) {
        log.silly(req.requestId, `Message ${payload.id} filtered because it was local-only`);
        return;
      }
```

I've placed it at the same spot where it was previously, so everything
should work as before. ~~**However, I still need to test those changes,
which is what I'll be doing after submitting this PR as draft.**~~

Checked the changes against our instance, everything is working as
expected as logged-in user. Haven't checked the public timelines where
the above snippet would be relevant, as we are using `AUTHORIZED_FETCH`
and I would like to keep it enabled. ^^

If the base branch is not correct, feel free to change it.

Everything is already deployed on queer.group and working fine there.

---------

Co-authored-by: Michael Stanclift <mx@vmstan.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Co-authored-by: Daniel M Brasil <danielmbrasil@protonmail.com>
Co-authored-by: yufushiro <62991447+yufushiro@users.noreply.github.com>
Co-authored-by: Nicolai Søborg <NicolaiSoeborg@users.noreply.github.com>
2023-09-19 19:49:27 -07:00
..
about More styling and content fixes to static about page 2022-12-30 22:03:52 -08:00
accounts Merge tag 'v3.5.5+hometown-1.0.8' into hometown-4.0-1.0.8-merge 2022-12-04 12:18:18 -08:00
admin Merge changes of 4.0.7..4.0.10 (#1324) 2023-09-19 19:49:27 -07:00
admin_mailer Add support for language preferences for trending statuses and links (#18288) 2022-10-08 16:45:40 +02:00
application Do not strip tags from `Setting.site_short_description` (#23975) 2023-03-14 10:00:07 +01:00
auth Merge tag 'v4.0.0' into hometown-4.0-merge 2022-11-16 20:54:49 -08:00
authorize_interactions Fix links to the Web UI in notifications (#19981) 2022-11-07 15:42:58 +01:00
custom_css Fix badge color not affected (#18826) 2022-07-19 01:06:11 +02:00
disputes/strikes Fix incorrect post links in strikes when the account is remote (#23611) 2023-03-16 11:58:34 +01:00
errors
filters Add ability to filter individual posts (#18945) 2022-08-25 04:27:47 +02:00
follower_accounts Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
following_accounts Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
home Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
invites
kaminari
layouts Revert About page to v3 static version (#1264) 2022-12-30 01:00:59 -08:00
media Fix error when trying to render component for media without meta (#16112) 2021-05-05 21:16:55 +02:00
notification_mailer Fix links to the Web UI in notifications (#19981) 2022-11-07 15:42:58 +01:00
oauth Merge upstream security fixes of v4.0.5 (#1316) 2023-07-06 12:30:13 -07:00
privacy Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
relationships Fix “Remove all followers from the selected domains” being more destructive than it claims (#23805) 2023-03-14 09:50:57 +01:00
settings Merge tag 'v4.0.4' into hometown-4.0.4 2023-05-19 11:25:13 +01:00
shared Do not strip tags from `Setting.site_short_description` (#23975) 2023-03-14 10:00:07 +01:00
shares Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
statuses Merge tag 'v4.0.0' into hometown-4.0-merge 2022-11-16 20:54:49 -08:00
statuses_cleanup Add option to keep local-only posts on auto-delete 2022-12-01 20:28:45 -08:00
tags Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
user_mailer Merge tag 'v4.0.4' into hometown-4.0.4 2023-05-19 11:25:13 +01:00
well_known/host_meta Remove dependency on goldfinger gem (#14919) 2020-10-19 14:48:54 +02:00