diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-06-15 20:51:39 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-06-15 20:51:39 +0200 |
commit | db200226b805db324a8efdfb951d7725eac3f9da (patch) | |
tree | a7d8298fc65bbd81e2f843048240de6e4fceffcf /app/services/post_status_service.rb | |
parent | afceef74c2377192f100b9307068895ec0ec7d45 (diff) | |
parent | 0df91c7b1e05952ebbfc552915e995d55af0a403 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/javascript/mastodon/initial_state.js db/schema.rb Upstream added a new field to initial_state. Not too sure about what happened with db/schema.rb though…
Diffstat (limited to 'app/services/post_status_service.rb')
-rw-r--r-- | app/services/post_status_service.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb index 6e982c7e6..843659eaa 100644 --- a/app/services/post_status_service.rb +++ b/app/services/post_status_service.rb @@ -22,7 +22,6 @@ 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.present? ApplicationRecord.transaction do status = account.statuses.create!(text: text, |