diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-16 17:10:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-16 17:10:27 +0100 |
| commit | 6af2300454c960ef83f7b7d31e9b829e0d5a8e38 (patch) | |
| tree | 97325ab7ad5a572170637da7a72ba72b7231a02f /app/models/status.rb | |
| parent | c2fa0f7c40bcc4064e8baaa221665eadd391c001 (diff) | |
| parent | 0fbe90e2d3cfc2c5d1fd12ea564daa52a83ec0ac (diff) | |
Merge pull request #961 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/status.rb')
| -rw-r--r-- | app/models/status.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index f576489b4..440d7cc63 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -73,7 +73,9 @@ class Status < ApplicationRecord validates_with StatusLengthValidator validates_with DisallowedHashtagsValidator validates :reblog, uniqueness: { scope: :account }, if: :reblog? - validates_associated :owned_poll + validates :visibility, exclusion: { in: %w(direct limited) }, if: :reblog? + + accepts_nested_attributes_for :owned_poll default_scope { recent } |