Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 6 deletions

diff --git a/app/models/zoom_meeting.rb b/app/models/zoom_meeting.rb
index fe2f351018c..f83aa93b69a 100644
--- a/app/models/zoom_meeting.rb
+++ b/app/models/zoom_meeting.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class ZoomMeeting < ApplicationRecord
+  include UsageStatistics
+
   belongs_to :project, optional: false
   belongs_to :issue, optional: false
 
@@ -23,10 +25,4 @@ class ZoomMeeting < ApplicationRecord
   def self.canonical_meeting_url(issue)
     canonical_meeting(issue)&.url
   end
-
-  def self.distinct_count_by(column = nil, fallback = -1)
-    distinct.count(column)
-  rescue ActiveRecord::StatementInvalid
-    fallback
-  end
 end