diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-25 15:17:21 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-25 15:17:21 +0000 |
| commit | 837b3804bfed9db1cf92923c4f6202aa7117d408 (patch) | |
| tree | c8b5a921754a6b40227364225002332b54d0d0dd /app/models/notification.rb | |
| parent | 995b59526b06e1f949cba59d76e5e2718a1674f6 (diff) | |
| parent | 85a395fab6d7077a252bfe6f96673931ea3aa5ee (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/models/notification.rb')
| -rw-r--r-- | app/models/notification.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/notification.rb b/app/models/notification.rb index 7f8dae5ec..be9964087 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -4,12 +4,12 @@ # Table name: notifications # # id :integer not null, primary key -# activity_id :integer -# activity_type :string +# activity_id :integer not null +# activity_type :string not null # created_at :datetime not null # updated_at :datetime not null -# account_id :integer -# from_account_id :integer +# account_id :integer not null +# from_account_id :integer not null # class Notification < ApplicationRecord |