Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 14 deletions

diff --git a/app/models/board_group_recent_visit.rb b/app/models/board_group_recent_visit.rb
index 979f0e1ab92..dc273e256a8 100644
--- a/app/models/board_group_recent_visit.rb
+++ b/app/models/board_group_recent_visit.rb
@@ -2,27 +2,19 @@
 
 # Tracks which boards in a specific group a user has visited
 class BoardGroupRecentVisit < ApplicationRecord
+  include BoardRecentVisit
+
   belongs_to :user
   belongs_to :group
   belongs_to :board
 
-  validates :user,  presence: true
+  validates :user, presence: true
   validates :group, presence: true
   validates :board, presence: true
 
-  scope :by_user_group, -> (user, group) { where(user: user, group: group) }
-
-  def self.visited!(user, board)
-    visit = find_or_create_by(user: user, group: board.group, board: board)
-    visit.touch if visit.updated_at < Time.current
-  rescue ActiveRecord::RecordNotUnique
-    retry
-  end
-
-  def self.latest(user, group, count: nil)
-    visits = by_user_group(user, group).order(updated_at: :desc)
-    visits = visits.preload(:board) if count && count > 1
+  scope :by_user_parent, -> (user, group) { where(user: user, group: group) }
 
-    visits.first(count)
+  def self.board_parent_relation
+    :group
   end
 end