Add latest changes from gitlab-org/gitlab@master

3 files changed, 0 insertions, 4 deletions

diff --git a/app/models/concerns/alert_event_lifecycle.rb b/app/models/concerns/alert_event_lifecycle.rb
index 4d2b717ead2..72fe7757b44 100644
--- a/app/models/concerns/alert_event_lifecycle.rb
+++ b/app/models/concerns/alert_event_lifecycle.rb
@@ -41,8 +41,6 @@ module AlertEventLifecycle
     scope :firing, -> { where(status: status_value_for(:firing)) }
     scope :resolved, -> { where(status: status_value_for(:resolved)) }
 
-    scope :count_by_project_id, -> { group(:project_id).count }
-
     def self.status_value_for(name)
       state_machines[:status].states[name].value
     end
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 5c307158a9a..4273eb331a1 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -92,7 +92,6 @@ module Issuable
     scope :recent, -> { reorder(id: :desc) }
     scope :of_projects, ->(ids) { where(project_id: ids) }
     scope :opened, -> { with_state(:opened) }
-    scope :only_opened, -> { with_state(:opened) }
     scope :closed, -> { with_state(:closed) }
 
     # rubocop:disable GitlabSecurity/SqlInjection
diff --git a/app/models/concerns/milestoneable.rb b/app/models/concerns/milestoneable.rb
index bd080f5c479..12041b103f6 100644
--- a/app/models/concerns/milestoneable.rb
+++ b/app/models/concerns/milestoneable.rb
@@ -14,7 +14,6 @@ module Milestoneable
 
     validate :milestone_is_valid
 
-    scope :of_milestones, ->(ids) { where(milestone_id: ids) }
     scope :any_milestone, -> { where.not(milestone_id: nil) }
     scope :with_milestone, ->(title) { left_joins_milestones.where(milestones: { title: title }) }
     scope :without_particular_milestone, ->(title) { left_outer_joins(:milestone).where("milestones.title != ? OR milestone_id IS NULL", title) }