diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-08-08 08:44:33 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-08-08 08:44:33 +0200 |
commit | ebc0521ba82cfc43094a1aead868c61118767030 (patch) | |
tree | afc3e03fc60c990e263e9721d3e0c6493d492d8a /app/models/domain_block.rb | |
parent | 86cfa2ea6cb94c9597b9fcda034c8b4d959c5e3e (diff) | |
parent | f51c7c105f1d04520656c1235f8a5f58d256fd0e (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/models/domain_block.rb')
-rw-r--r-- | app/models/domain_block.rb | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb index 25d3b87ef..3f5b9f23e 100644 --- a/app/models/domain_block.rb +++ b/app/models/domain_block.rb @@ -3,13 +3,15 @@ # # Table name: domain_blocks # -# id :bigint(8) not null, primary key -# domain :string default(""), not null -# created_at :datetime not null -# updated_at :datetime not null -# severity :integer default("silence") -# reject_media :boolean default(FALSE), not null -# reject_reports :boolean default(FALSE), not null +# id :bigint(8) not null, primary key +# domain :string default(""), not null +# created_at :datetime not null +# updated_at :datetime not null +# severity :integer default("silence") +# reject_media :boolean default(FALSE), not null +# reject_reports :boolean default(FALSE), not null +# private_comment :text +# public_comment :text # class DomainBlock < ApplicationRecord |