Commit 03738bdd authored by Stan Hu's avatar Stan Hu

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

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

Fixes #20157

See merge request !5446
parents 63f39602 bfaacb7b
Pipeline #3772760 passed with stages
in 1384 minutes and 8 seconds
......@@ -7,6 +7,9 @@ v 8.11.0 (unreleased)
- Load project invited groups and members eagerly in ProjectTeam#fetch_members
- Add GitLab Workhorse version to admin dashboard (Katarzyna Kobierska Ula Budziszewska)
v 8.10.1 (unreleased)
- Fix bug where replies to commit notes displayed in the MR discussion tab wouldn't show up on the commit page
v 8.10.0
- Fix profile activity heatmap to show correct day name (eanplatter)
- Speed up ExternalWikiHelper#get_project_wiki_path
......
......@@ -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
......@@ -217,10 +217,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
......@@ -238,4 +234,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
class NullifyBlankTypeOnNotes < ActiveRecord::Migration
include Gitlab::Database::MigrationHelpers
DOWNTIME = false
def up
execute "UPDATE notes SET type = NULL WHERE type = ''"
end
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment