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

2018-01-08 10:17:15 +00:00
parent 722b3f567f dbda87c31f
commit f839ac694c
10 changed files with 31 additions and 138 deletions
--- a/app/models/follow_request.rb
+++ b/app/models/follow_request.rb
@ -21,10 +21,6 @@ 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)