Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 2 deletions

diff --git a/lib/gitlab/background_migration/user_mentions/models/note.rb b/lib/gitlab/background_migration/user_mentions/models/note.rb
index fb61de638a8..7a1a0223bc7 100644
--- a/lib/gitlab/background_migration/user_mentions/models/note.rb
+++ b/lib/gitlab/background_migration/user_mentions/models/note.rb
@@ -20,7 +20,7 @@ module Gitlab
           belongs_to :project
 
           def for_personal_snippet?
-            noteable.class.name == 'PersonalSnippet'
+            noteable && noteable.class.name == 'PersonalSnippet'
           end
 
           def for_project_noteable?
@@ -32,7 +32,7 @@ module Gitlab
           end
 
           def for_epic?
-            noteable.class.name == 'Epic'
+            noteable && noteable_type == 'Epic'
           end
 
           def user_mention_resource_id
@@ -43,6 +43,14 @@ module Gitlab
             id
           end
 
+          def noteable
+            super unless for_commit?
+          end
+
+          def for_commit?
+            noteable_type == "Commit"
+          end
+
           private
 
           def mentionable_params
@@ -52,6 +60,8 @@ module Gitlab
           end
 
           def banzai_context_params
+            return {} unless noteable
+
             { group: noteable.group, label_url_method: :group_epics_url }
           end
         end