Merge remote-tracking branch 'upstream/pull/4169'

[rails.git] / app / models / friendship.rb

diff --git a/app/models/friendship.rb b/app/models/friendship.rb
index 27b25aee1b31313674db1d1578701873c921f160..476821b47ccdb221b31b603cfa97352611425c86 100644 (file)
--- a/app/models/friendship.rb
+++ b/app/models/friendship.rb
@@ -17,7 +17,7 @@
 #  friends_user_id_fkey         (user_id => users.id)
 #
 
 #  friends_user_id_fkey         (user_id => users.id)
 #
 

-class Friendship < ActiveRecord::Base
+class Friendship < ApplicationRecord

   self.table_name = "friends"
 
   belongs_to :befriender, :class_name => "User", :foreign_key => :user_id
   self.table_name = "friends"
 
   belongs_to :befriender, :class_name => "User", :foreign_key => :user_id