summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2023-09-05 14:50:09 +0200
committerClaire <claire.github-309c@sitedethib.com>2023-09-05 19:16:09 +0200
commit5f88a2d70bee2a48b43bb34f0fde780ae9749162 (patch)
tree0e54508dde307ff9e7f211d174c601ef2dd7c51a
parentcf80d54cbae952705af250a9764c6e25e77cc3c7 (diff)
Bump version to v4.1.7v4.1.7
-rw-r--r--CHANGELOG.md12
-rw-r--r--docker-compose.yml6
-rw-r--r--lib/mastodon/version.rb2
3 files changed, 16 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index aeb89ef5c4b..3c9b8517e25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,18 @@ Changelog
All notable changes to this project will be documented in this file.
+## [4.1.7] - 2023-09-05
+
+### Changed
+
+- Change remote report processing to accept reports with long comments, but truncate them ([ThisIsMissEm](https://github.com/mastodon/mastodon/pull/25028))
+
+### Fixed
+
+- **Fix blocking subdomains of an already-blocked domain** ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/26392))
+- Fix `/api/v1/timelines/tag/:hashtag` allowing for unauthenticated access when public preview is disabled ([danielmbrasil](https://github.com/mastodon/mastodon/pull/26237))
+- Fix inefficiencies in `PlainTextFormatter` ([ClearlyClaire](https://github.com/mastodon/mastodon/pull/26727))
+
## [4.1.6] - 2023-07-31
### Fixed
diff --git a/docker-compose.yml b/docker-compose.yml
index ae6aefb37f7..d739156e2a0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -56,7 +56,7 @@ services:
web:
build: .
- image: ghcr.io/mastodon/mastodon:v4.1.6
+ image: ghcr.io/mastodon/mastodon:v4.1.7
restart: always
env_file: .env.production
command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
@@ -77,7 +77,7 @@ services:
streaming:
build: .
- image: ghcr.io/mastodon/mastodon:v4.1.6
+ image: ghcr.io/mastodon/mastodon:v4.1.7
restart: always
env_file: .env.production
command: node ./streaming
@@ -95,7 +95,7 @@ services:
sidekiq:
build: .
- image: ghcr.io/mastodon/mastodon:v4.1.6
+ image: ghcr.io/mastodon/mastodon:v4.1.7
restart: always
env_file: .env.production
command: bundle exec sidekiq
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 1277084f0e2..2e46cdf0092 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
end
def patch
- 6
+ 7
end
def flags