Merge pull request #216 from glitch-soc/merge-upstream-3023725

Merge upstream at commit 3023725

1 files changed, 4 insertions, 6 deletions

diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb
index 1a1c52382..962b61411 100644
--- a/app/models/follow_request.rb
+++ b/app/models/follow_request.rb
@@ -5,9 +5,9 @@
 #
 #  created_at        :datetime         not null
 #  updated_at        :datetime         not null
-#  account_id        :integer          not null
-#  id                :integer          not null, primary key
-#  target_account_id :integer          not null
+#  account_id        :bigint          not null
+#  id                :bigint          not null, primary key
+#  target_account_id :bigint          not null
 #  show_reblogs      :boolean          default(TRUE), not null
 #
 
@@ -28,7 +28,5 @@ class FollowRequest < ApplicationRecord
     destroy!
   end
 
-  def reject!
-    destroy!
-  end
+  alias reject! destroy!
 end