summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2023-07-21 14:33:34 +0200
committerClaire <claire.github-309c@sitedethib.com>2023-07-21 16:07:24 +0200
commit80c00f4aa57fd21679fade777310422e55274c65 (patch)
treec05fc9519ed0d11ed50c838c4d2b2c0f8f3f75e9
parent1a0192537d11fb8932735c33f904e8fc4263356b (diff)
Bump version to v3.5.11v3.5.11
-rw-r--r--CHANGELOG.md20
-rw-r--r--docker-compose.yml6
-rw-r--r--lib/mastodon/version.rb2
3 files changed, 24 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b6294483d1..f99c2b6b1f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,26 @@ Changelog
All notable changes to this project will be documented in this file.
+## [3.5.11] - 2023-07-21
+
+### Added
+
+- Add check preventing Sidekiq workers from running with Makara configured ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25850))
+
+### Changed
+
+- Change request timeout handling to use a longer deadline ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/26055))
+
+### Fixed
+
+- Fix moderation interface for remote instances with a .zip TLD ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25886))
+- Fix remote accounts being possibly persisted to database with incomplete protocol values ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/25886))
+- Fix trending publishers table not rendering correctly on narrow screens ([vmstan](https://github.com/mastodon/mastodon/pull/25945))
+
+### Security
+
+- Fix CSP headers being unintentionally wide ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/26105))
+
## [3.5.10] - 2023-07-07
### Fixed
diff --git a/docker-compose.yml b/docker-compose.yml
index 00709835981..7d32c125c89 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -44,7 +44,7 @@ services:
web:
build: .
- image: ghcr.io/mastodon/mastodon:v3.5.9
+ image: ghcr.io/mastodon/mastodon:v3.5.11
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.9
+ image: ghcr.io/mastodon/mastodon:v3.5.11
restart: always
env_file: .env.production
command: node ./streaming
@@ -83,7 +83,7 @@ services:
sidekiq:
build: .
- image: ghcr.io/mastodon/mastodon:v3.5.9
+ image: ghcr.io/mastodon/mastodon:v3.5.11
restart: always
env_file: .env.production
command: bundle exec sidekiq
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 89cc9b18d82..624e8e9fe39 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
end
def patch
- 10
+ 11
end
def flags