Merge branch 'nullify-note-type' into 'master'

Fix bug where replies to commit notes displayed in the MR discussion tab wouldn'…

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20157

See merge request !5446

Signed-off-by: Rémy Coutable <remy@rymai.me>

1 files changed, 9 insertions, 5 deletions

diff --git a/app/models/note.rb b/app/models/note.rb
index 0ce10c77de9..88c8e3afcc1 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -69,7 +69,7 @@ class Note < ActiveRecord::Base
              project: [:project_members, { group: [:group_members] }])
   end
 
-  before_validation :clear_blank_line_code!
+  before_validation :nullify_blank_type, :nullify_blank_line_code
   after_save :keep_around_commit
 
   class << self
@@ -216,10 +216,6 @@ class Note < ActiveRecord::Base
     !system?
   end
 
-  def clear_blank_line_code!
-    self.line_code = nil if self.line_code.blank?
-  end
-
   def can_be_award_emoji?
     noteable.is_a?(Awardable)
   end
@@ -237,4 +233,12 @@ class Note < ActiveRecord::Base
   def keep_around_commit
     project.repository.keep_around(self.commit_id)
   end
+
+  def nullify_blank_type
+    self.type = nil if self.type.blank?
+  end
+
+  def nullify_blank_line_code
+    self.line_code = nil if self.line_code.blank?
+  end
 end