Merge commit '13ab4b54e2b9cb9ddfcbe9dd3d820a7ba9164412' into glitch-s…

…oc/stable-4.3
glitch-soc · Dec 3, 2024 · c2d65f7 · c2d65f7
2 parents df0b641 + 13ab4b5
commit c2d65f7
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.2] - UNRELEASED
+## [4.3.2] - 2024-12-03
 
 ### 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.1
+    image: ghcr.io/mastodon/mastodon:v4.3.2
     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.1
+    image: ghcr.io/mastodon/mastodon-streaming:v4.3.2
     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.1
+    image: ghcr.io/mastodon/mastodon:v4.3.2
     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
-      1
+      2
     end
 
     def default_prerelease
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ def minor @@
         end
         def patch
         end
         def default_prerelease
@@ Expand Down @@