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

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

diff --git a/app/models/friendship.rb b/app/models/friendship.rb
index 27b25aee1b31313674db1d1578701873c921f160..2b1c7ce00a845d0e85181e50b5c495e718237250 100644 (file)
--- a/app/models/friendship.rb
+++ b/app/models/friendship.rb
@@ -5,11 +5,12 @@
 #  id             :bigint(8)        not null, primary key
 #  user_id        :bigint(8)        not null
 #  friend_user_id :bigint(8)        not null
+#  created_at     :datetime
 #
 # Indexes
 #
-#  friends_user_id_idx  (user_id)
-#  user_id_idx          (friend_user_id)
+#  index_friends_on_user_id_and_created_at  (user_id,created_at)
+#  user_id_idx                              (friend_user_id)
 #
 # Foreign Keys
 #
@@ -17,7 +18,7 @@
 #  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