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

2018-01-03 20:17:13 +00:00
parent 933840bebf d907d4352e
commit fc884d015a
66 changed files with 679 additions and 262 deletions
--- a/app/models/follow_request.rb
+++ b/app/models/follow_request.rb
@ -21,6 +21,10 @@ class FollowRequest < ApplicationRecord

  validates :account_id, uniqueness: { scope: :target_account_id }

+  def object_type
+    :follow
+  end
+
  def authorize!
    account.follow!(target_account, reblogs: show_reblogs)
    MergeWorker.perform_async(target_account.id, account.id)