diff options
| author | Reverite <github@reverite.sh> | 2019-05-21 20:48:57 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-05-21 20:48:57 -0700 |
| commit | d873e4f3d5878a2b2800758cbe3b9c870c228d51 (patch) | |
| tree | 23a3a373699381d4bd4f629136b9c82de5df96a3 /app/models/status.rb | |
| parent | 4cea89bf2e9ce7f73fccfc637191b1e039ad25ee (diff) | |
| parent | 2332b3f146b0d879daba8a99bd35c8bf425edea3 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/models/status.rb')
| -rw-r--r-- | app/models/status.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index 8736e65e3..6f3ba4cc3 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -24,6 +24,7 @@ # local_only :boolean # full_status_text :text default(""), not null # poll_id :bigint(8) +# content_type :string # class Status < ApplicationRecord @@ -74,6 +75,7 @@ class Status < ApplicationRecord validates_with DisallowedHashtagsValidator validates :reblog, uniqueness: { scope: :account }, if: :reblog? validates :visibility, exclusion: { in: %w(direct limited) }, if: :reblog? + validates :content_type, inclusion: { in: %w(text/plain text/markdown text/html) }, allow_nil: true accepts_nested_attributes_for :poll |