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
9aabd518
Commit
9aabd518
authored
Mar 31, 2022
by
Igor Drozdov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove remove_import_data_on_failure feature flag
Changelog: removed
parent
b0a4f182
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
24 deletions
+1
-24
app/models/project_import_state.rb
app/models/project_import_state.rb
+1
-3
config/feature_flags/development/remove_import_data_on_failure.yml
...ature_flags/development/remove_import_data_on_failure.yml
+0
-8
spec/models/project_import_state_spec.rb
spec/models/project_import_state_spec.rb
+0
-13
No files found.
app/models/project_import_state.rb
View file @
9aabd518
...
@@ -58,10 +58,8 @@ class ProjectImportState < ApplicationRecord
...
@@ -58,10 +58,8 @@ class ProjectImportState < ApplicationRecord
end
end
after_transition
any
=>
:failed
do
|
state
,
_
|
after_transition
any
=>
:failed
do
|
state
,
_
|
if
Feature
.
enabled?
(
:remove_import_data_on_failure
,
state
.
project
,
default_enabled: :yaml
)
state
.
project
.
remove_import_data
state
.
project
.
remove_import_data
end
end
end
after_transition
started: :finished
do
|
state
,
_
|
after_transition
started: :finished
do
|
state
,
_
|
project
=
state
.
project
project
=
state
.
project
...
...
config/feature_flags/development/remove_import_data_on_failure.yml
deleted
100644 → 0
View file @
b0a4f182
---
name
:
remove_import_data_on_failure
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80074
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/352156
milestone
:
'
14.8'
type
:
development
group
:
group::source code
default_enabled
:
true
spec/models/project_import_state_spec.rb
View file @
9aabd518
...
@@ -89,19 +89,6 @@ RSpec.describe ProjectImportState, type: :model do
...
@@ -89,19 +89,6 @@ RSpec.describe ProjectImportState, type: :model do
import_state
.
mark_as_failed
(
error_message
)
import_state
.
mark_as_failed
(
error_message
)
end
.
to
change
{
project
.
reload
.
import_data
}.
from
(
import_data
).
to
(
nil
)
end
.
to
change
{
project
.
reload
.
import_data
}.
from
(
import_data
).
to
(
nil
)
end
end
context
'when remove_import_data_on_failure feature flag is disabled'
do
it
'removes project import data'
do
stub_feature_flags
(
remove_import_data_on_failure:
false
)
project
=
create
(
:project
,
import_data:
ProjectImportData
.
new
(
data:
{
'test'
=>
'some data'
}))
import_state
=
create
(
:import_state
,
:started
,
project:
project
)
expect
do
import_state
.
mark_as_failed
(
error_message
)
end
.
not_to
change
{
project
.
reload
.
import_data
}
end
end
end
end
describe
'#human_status_name'
do
describe
'#human_status_name'
do
...
...
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