Skip to content

Commit

Permalink
Merge tag 'v4.3.1' into glitch-soc/backports-4.3
Browse files Browse the repository at this point in the history
  • Loading branch information
ClearlyClaire committed Oct 21, 2024
2 parents d5a3478 + 9adb96f commit 90f6984
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/mastodon/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def minor
end

def patch
0
1
end

def default_prerelease
Expand Down

0 comments on commit 90f6984

Please sign in to comment.