hometown/config
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
..
environments Fix `ENV` (#20377) 2022-11-11 01:33:32 +01:00
imagemagick Merge upstream security fixes of v4.0.5 (#1316) 2023-07-06 12:30:13 -07:00
initializers Merge changes of 4.0.7..4.0.10 (#1324) 2023-09-19 19:49:27 -07:00
locales Merge upstream security fixes of v4.0.5 (#1316) 2023-07-06 12:30:13 -07:00
webpack Replace to `workbox-webpack-plugin` from `offline-plugin` (#18409) 2022-08-25 20:10:01 +02:00
application.rb Merge upstream security fixes of v4.0.5 (#1316) 2023-07-06 12:30:13 -07:00
boot.rb Bump bootsnap from 1.6.0 to 1.8.1 (#16677) 2021-09-19 14:42:32 +09:00
brakeman.ignore Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2022-03-22 10:07:11 +01:00
database.yml Fix pgBouncer resetting application name on every transaction (#23958) 2023-03-14 09:59:30 +01:00
deploy.rb Change `master` branch to `main` branch (#20290) 2022-11-10 04:02:05 +01:00
environment.rb
i18n-tasks.yml Change privacy policy to be rendered in web UI, add REST API (#19310) 2022-10-08 06:01:11 +02:00
navigation.rb Change settings area to be separated into categories in admin UI (#19407) 2022-10-22 11:44:41 +02:00
pghero.yml Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595) 2020-05-04 13:52:41 +02:00
puma.rb Add PERSISTENT_TIMEOUT option (#11756) 2019-09-04 20:44:08 +02:00
roles.yml Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
routes.rb Merge changes of 4.0.7..4.0.10 (#1324) 2023-09-19 19:49:27 -07:00
secrets.yml
settings.yml Revert About page to v3 static version (#1264) 2022-12-30 01:00:59 -08:00
sidekiq.yml Change incoming activity processing to happen in `ingress` queue (#20264) 2022-11-10 14:21:51 +01:00
storage.yml Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
themes.yml Merge branch 'fairy-floss-theme' of github.com:emmawinston/hometown into hometown-dev 2019-08-31 15:38:45 -07:00
webpacker.yml