Merge branch 'master' into 38869-commitslist38869-commitslist

* master: (83 commits)
  Move cycle analytics banner into a vue file
  Remove executable permissions on images to make docs lint happy
  Sync up hard coded DN class in migration
  Redefine `respond_to?` in light of `method_missing`
  Make internal methods private
  Leave bad DNs alone instead of raising errors
  Refactor DN error classes
  Add changelog entry for LDAP normalization
  Add migration specs
  Move migration to background
  Update DN class in migration
  Normalize values, reusing DN normalization code
  Remove telephoneNumber format comment
  Fix space stripping
  Rename method to `to_normalized_s`
  Refactor initialize method for clarity
  Move downcasing to normalize method
  Normalize existing persisted DNs
  Resolve Rubocop offenses
  Switch to new DN class
  ...

1 files changed, 12 insertions, 4 deletions

diff --git a/app/models/note.rb b/app/models/note.rb
index f44590e2144..ceded9f2aef 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -134,14 +134,22 @@ class Note < ActiveRecord::Base
       Discussion.build(notes)
     end
 
+    # Group diff discussions by line code or file path.
+    # It is not needed to group by line code when comment is
+    # on an image.
     def grouped_diff_discussions(diff_refs = nil)
       groups = {}
 
       diff_notes.fresh.discussions.each do |discussion|
-        line_code = discussion.line_code_in_diffs(diff_refs)
-
-        if line_code
-          discussions = groups[line_code] ||= []
+        group_key =
+          if discussion.on_image?
+            discussion.file_new_path
+          else
+            discussion.line_code_in_diffs(diff_refs)
+          end
+
+        if group_key
+          discussions = groups[group_key] ||= []
           discussions << discussion
         end
       end