diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-07-28 10:07:57 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2023-07-31 14:33:27 +0200 |
| commit | a3d31ffc1ead2abe98a8b722b406a7574a14a915 (patch) | |
| tree | 84aa1931b6630a95bae6d40341a29df176e3a9d3 | |
| parent | 50f4af28b0f1fde03e1a57583bccc1387d6f08bf (diff) | |
Bump version to v3.5.12v3.5.12
| -rw-r--r-- | .github/workflows/build-image.yml | 2 | ||||
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | docker-compose.yml | 6 | ||||
| -rw-r--r-- | lib/mastodon/version.rb | 2 |
4 files changed, 12 insertions, 5 deletions
diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 2440b9ae709..e1683377eee 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -45,7 +45,7 @@ jobs: tootsuite/mastodon ghcr.io/mastodon/mastodon flavor: | - latest=auto + latest=false tags: | type=edge,branch=main type=match,pattern=v(.*),group=0 diff --git a/CHANGELOG.md b/CHANGELOG.md index f99c2b6b1f1..01a67667ea0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ Changelog All notable changes to this project will be documented in this file. +## [3.5.12] - 2023-07-31 + +### Fixed + +- Fix memory leak in streaming server ([ThisIsMissEm](https://github.com/mastodon/mastodon/pull/26228)) +- Fix incorrect connect timeout in outgoing requests ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/26116)) + ## [3.5.11] - 2023-07-21 ### Added diff --git a/docker-compose.yml b/docker-compose.yml index 7d32c125c89..0db8753f2a4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -44,7 +44,7 @@ services: web: build: . - image: ghcr.io/mastodon/mastodon:v3.5.11 + image: ghcr.io/mastodon/mastodon:v3.5.12 restart: always env_file: .env.production command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000" @@ -65,7 +65,7 @@ services: streaming: build: . - image: ghcr.io/mastodon/mastodon:v3.5.11 + image: ghcr.io/mastodon/mastodon:v3.5.12 restart: always env_file: .env.production command: node ./streaming @@ -83,7 +83,7 @@ services: sidekiq: build: . - image: ghcr.io/mastodon/mastodon:v3.5.11 + image: ghcr.io/mastodon/mastodon:v3.5.12 restart: always env_file: .env.production command: bundle exec sidekiq diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 624e8e9fe39..af695330a1b 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -13,7 +13,7 @@ module Mastodon end def patch - 11 + 12 end def flags |