diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-04-04 14:51:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-04 14:51:42 +0200 |
| commit | 48dfdad49255ae4a100e01f41852e65806858fce (patch) | |
| tree | a2bfe7a94bcd7a37399470b31c0453e1b489dea9 /app/models/status.rb | |
| parent | 5b6f4fdeb4932df1704da01762cc22c63aacb20f (diff) | |
| parent | ed4a723a82e90fc057494e4fdec4a2074a3164c7 (diff) | |
Merge branch 'master' into patch-1
Diffstat (limited to 'app/models/status.rb')
| -rw-r--r-- | app/models/status.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index 81b26fd14..daf128572 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -188,7 +188,7 @@ class Status < ApplicationRecord end before_validation do - text.strip! + text&.strip! spoiler_text&.strip! self.reply = !(in_reply_to_id.nil? && thread.nil?) unless reply |