Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 16:59:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'db0cd9489c70e985da961a585f3a809ca449dccf' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/services/post_status_service.rb`:
  Upstream updated the logic to move the CW to the text content.
  Glitch-soc does not move CW to text content but has some logic
  to avoid the text being empty. Update the logic according to upstream's
  change.
- `docker-compose.yml`:
  Conflict because of different paths for composer images.
  Updated version as upstream did while keeping our path.
This commit is contained in:
Claire
2025-09-17 20:10:28 +02:00
parent 0a6895f8b9 db0cd9489c
commit 3a31ef11cc
4 changed files with 55 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/post_status_service.rb
View File

@@ -65,7 +65,7 @@ class PostStatusService < BaseService
private
def fill_blank_text!
return unless @text.blank? && @options[:spoiler_text].present?
return unless @text.blank? && @options[:spoiler_text].present? && @quoted_status.blank?
@text = begin
if @media&.any?(&:video?) || @media&.any?(&:gifv?)