Merge pull request #2888 from ClearlyClaire/glitch-soc/backports-4.3

Backports upstream changes to glitch-soc (stable 4.3)
glitch-soc · Oct 21, 2024 · 39fb314 · 39fb314
2 parents d5a3478 + 90f6984
commit 39fb314
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
-## [4.3.1] - UNRELEASED
+## [4.3.1] - 2024-10-21
 
 ### Added
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -59,7 +59,7 @@ services:
   web:
     # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
     # build: .
-    image: ghcr.io/mastodon/mastodon:v4.3.0
+    image: ghcr.io/mastodon/mastodon:v4.3.1
     restart: always
     env_file: .env.production
     command: bundle exec puma -C config/puma.rb
@@ -83,7 +83,7 @@ services:
     # build:
     #   dockerfile: ./streaming/Dockerfile
     #   context: .
-    image: ghcr.io/mastodon/mastodon-streaming:v4.3.0
+    image: ghcr.io/mastodon/mastodon-streaming:v4.3.1
     restart: always
     env_file: .env.production
     command: node ./streaming/index.js
@@ -101,7 +101,7 @@ services:
 
   sidekiq:
     build: .
-    image: ghcr.io/mastodon/mastodon:v4.3.0
+    image: ghcr.io/mastodon/mastodon:v4.3.1
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq

diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ def minor
     end
 
     def patch
-      0
+      1
     end
 
     def default_prerelease