diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-08 09:48:42 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-01-08 09:48:42 -0600 |
| commit | 65986b6f0b66ea285b89bb82531067db146d8ecc (patch) | |
| tree | 6c69dd7748ef1cd9ccc8cb1af32a4f27ca23586a /app/models/follow_request.rb | |
| parent | 2dc4fbbd1a13adbdca26a0b42ee6e289e736bba1 (diff) | |
| parent | f839ac694c3f8050e4c7ec84884283e35f6ac662 (diff) | |
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
Diffstat (limited to 'app/models/follow_request.rb')
| -rw-r--r-- | app/models/follow_request.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb index 33e5fec12..ebf6959ce 100644 --- 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) |