diff options
author | David Yip <yipdw@member.fsf.org> | 2017-11-17 17:40:00 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2017-11-17 17:40:00 -0600 |
commit | 1ab12ba38ebd42be93b63b7cf0d3c6a81060b741 (patch) | |
tree | 3899389c63c16e33dd48fadb270d3259a7c15b67 /app/models/notification.rb | |
parent | 6f8ccbfcdf7fd8ca651d1583a608e96b25a09e25 (diff) | |
parent | 24cafd73a2b644025e9aeaadf4fed46dd3ecea4d (diff) |
Merge remote-tracking branch 'origin/master' into merge-upstream
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 c88af9021..a3ffb1f45 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -3,13 +3,13 @@ # # Table name: notifications # -# id :bigint not null, primary key -# account_id :bigint -# activity_id :bigint +# id :integer not null, primary key +# activity_id :integer # activity_type :string # created_at :datetime not null # updated_at :datetime not null -# from_account_id :bigint +# account_id :integer +# from_account_id :integer # class Notification < ApplicationRecord |