Merge remote-tracking branch 'glitchsoc/master' into gs-master

Conflicts: db/schema.rb
2018-04-14 03:50:31 -05:00
parent 78aca92689 95a892accd
commit d66192f21c
30 changed files with 705 additions and 2 deletions
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -80,6 +80,7 @@ class Account < ApplicationRecord
  has_many :stream_entries, inverse_of: :account, dependent: :destroy
  has_many :statuses, inverse_of: :account, dependent: :destroy
  has_many :favourites, inverse_of: :account, dependent: :destroy
+  has_many :bookmarks, inverse_of: :account, dependent: :destroy
  has_many :mentions, inverse_of: :account, dependent: :destroy
  has_many :notifications, inverse_of: :account, dependent: :destroy