From cae51adfbb6fcfaa61fa55ec5706f9217a9079d8 Mon Sep 17 00:00:00 2001 From: Johannes Zellner Date: Tue, 4 Apr 2023 14:06:00 +0200 Subject: [PATCH] Bump version --- CHANGELOG | 10 ++++++++++ CloudronManifest.json | 4 ++-- Dockerfile | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 8004111..72f6191 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -294,3 +294,13 @@ [1.11.2] * Update nginx config +[1.11.3] +* Update Mastodon to 4.1.2 +* [Full changelog](https://github.com/mastodon/mastodon/releases/tag/v4.1.2) +* Fix crash in tootctl commands making use of parallelization when Elasticsearch is enabled (ClearlyClaire, ClearlyClaire) +* Fix crash in db:setup when Elasticsearch is enabled (rrgeorge) +* Fix user archive takeout when using OpenStack Swift or S3 providers with no ACL support (ClearlyClaire) +* Fix invalid/expired invites being processed on sign-up (ClearlyClaire) +* Update Ruby to 3.0.6 due to ReDoS vulnerabilities (saizai) +* Fix unescaped user input in LDAP query (ClearlyClaire) + diff --git a/CloudronManifest.json b/CloudronManifest.json index 3398f05..db18cf8 100644 --- a/CloudronManifest.json +++ b/CloudronManifest.json @@ -5,8 +5,8 @@ "description": "file://DESCRIPTION.md", "changelog": "file://CHANGELOG", "tagline": "Federated social network", - "version": "1.11.2", - "upstreamVersion": "4.1.1", + "version": "1.11.3", + "upstreamVersion": "4.1.2", "healthCheckPath": "/about", "httpPort": 8000, "memoryLimit": 1610612736, diff --git a/Dockerfile b/Dockerfile index 67218f7..8c04372 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,7 +34,7 @@ RUN gem install --no-document bundler ENV RAILS_ENV production ENV NODE_ENV production -ARG VERSION=4.1.1 +ARG VERSION=4.1.2 RUN curl -L https://github.com/tootsuite/mastodon/archive/v${VERSION}.tar.gz | tar -xz --strip-components 1 -f - && \ bundle config --local set deployment 'true' && \