Commit 93310098 authored by Mikołaj Wawrzyniak's avatar Mikołaj Wawrzyniak

Merge branch '343690-legacydiffnote-st_diff-being-set-incorrectly-some-of-the-time' into 'master'

Remove skip_legacy_diff_note_callback_on_import from legacy diff note

See merge request gitlab-org/gitlab!73207
parents b68ebe5f d2e74ca7
...@@ -91,7 +91,7 @@ class LegacyDiffNote < Note ...@@ -91,7 +91,7 @@ class LegacyDiffNote < Note
end end
def skip_setting_st_diff? def skip_setting_st_diff?
st_diff.present? && importing? && Feature.enabled?(:skip_legacy_diff_note_callback_on_import, default_enabled: :yaml) st_diff.present? && importing?
end end
def diff_for_line_code def diff_for_line_code
......
---
name: skip_legacy_diff_note_callback_on_import
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72897
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343666
milestone: '14.5'
type: development
group: group::import
default_enabled: false
...@@ -36,18 +36,6 @@ RSpec.describe LegacyDiffNote do ...@@ -36,18 +36,6 @@ RSpec.describe LegacyDiffNote do
expect(note.st_diff).to eq('_st_diff_') expect(note.st_diff).to eq('_st_diff_')
end end
context 'when feature flag is false' do
before do
stub_feature_flags(skip_legacy_diff_note_callback_on_import: false)
end
it 'updates st_diff' do
note.save!(validate: false)
expect(note.st_diff).to eq({})
end
end
context 'when st_diff is blank' do context 'when st_diff is blank' do
before do before do
note.st_diff = nil note.st_diff = nil
......
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