Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d2e74ca7
Commit
d2e74ca7
authored
Oct 27, 2021
by
Doug Stull
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove skip_legacy_diff_note_callback_on_import feature flag
- no longer needed after investigaton Changelog: changed
parent
69178bb0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
21 deletions
+1
-21
app/models/legacy_diff_note.rb
app/models/legacy_diff_note.rb
+1
-1
config/feature_flags/development/skip_legacy_diff_note_callback_on_import.yml
.../development/skip_legacy_diff_note_callback_on_import.yml
+0
-8
spec/models/legacy_diff_note_spec.rb
spec/models/legacy_diff_note_spec.rb
+0
-12
No files found.
app/models/legacy_diff_note.rb
View file @
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
...
...
config/feature_flags/development/skip_legacy_diff_note_callback_on_import.yml
deleted
100644 → 0
View file @
69178bb0
---
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
spec/models/legacy_diff_note_spec.rb
View file @
d2e74ca7
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment