Merge branch 'master' into glitch-soc/merge

2018-05-14 20:51:50 +02:00
parent 4665965543 03b69ebc45
commit ba7ee67498
36 changed files with 314 additions and 260 deletions
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@ -22,7 +22,7 @@ class PostStatusService < BaseService
    media  = validate_media!(options[:media_ids])
    status = nil
    text   = options.delete(:spoiler_text) if text.blank? && options[:spoiler_text].present?
-    text   = '.' if text.blank? && !media.empty?
+    text   = '.' if text.blank? && media.present?

    ApplicationRecord.transaction do
      status = account.statuses.create!(text: text,