1 files changed, 2 insertions, 5 deletions
diff --git a/app/models/concerns/resolvable_discussion.rb b/app/models/concerns/resolvable_discussion.rb
index 5cb51196a94..dd979e7bb17 100644
--- a/app/models/concerns/resolvable_discussion.rb
+++ b/app/models/concerns/resolvable_discussion.rb
@@ -20,6 +20,8 @@ module ResolvableDiscussion
       :last_note
     )
 
+    delegate :potentially_resolvable?, to: :first_note
+
     delegate  :resolved_at,
               :resolved_by,
 
@@ -27,11 +29,6 @@ module ResolvableDiscussion
               allow_nil: true
   end
 
-  # Keep this method in sync with the `potentially_resolvable` scope on `ResolvableNote`
-  def potentially_resolvable?
-    for_merge_request?
-  end
-
   def resolvable?
     return @resolvable if @resolvable.present?