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
8897e37d
Commit
8897e37d
authored
Jan 19, 2022
by
Alan (Maciej) Paruszewski
Committed by
Mark Chao
Jan 19, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove permitted_attributes_for_import_export feature flag
Changelog: changed
parent
c946f083
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
14 deletions
+2
-14
config/feature_flags/development/permitted_attributes_for_import_export.yml
...gs/development/permitted_attributes_for_import_export.yml
+0
-8
lib/gitlab/import_export/base/relation_factory.rb
lib/gitlab/import_export/base/relation_factory.rb
+1
-1
lib/gitlab/import_export/group/relation_tree_restorer.rb
lib/gitlab/import_export/group/relation_tree_restorer.rb
+1
-5
No files found.
config/feature_flags/development/permitted_attributes_for_import_export.yml
deleted
100644 → 0
View file @
c946f083
---
name
:
permitted_attributes_for_import_export
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70168
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/340789
milestone
:
'
14.4'
type
:
development
group
:
group::import
default_enabled
:
true
lib/gitlab/import_export/base/relation_factory.rb
View file @
8897e37d
...
@@ -196,7 +196,7 @@ module Gitlab
...
@@ -196,7 +196,7 @@ module Gitlab
end
end
def
use_attributes_permitter?
def
use_attributes_permitter?
Feature
.
enabled?
(
:permitted_attributes_for_import_export
,
default_enabled: :yaml
)
true
end
end
def
existing_or_new_object
def
existing_or_new_object
...
...
lib/gitlab/import_export/group/relation_tree_restorer.rb
View file @
8897e37d
...
@@ -118,7 +118,7 @@ module Gitlab
...
@@ -118,7 +118,7 @@ module Gitlab
end
end
def
filter_attributes
(
params
)
def
filter_attributes
(
params
)
if
use_attributes_permitter?
&&
attributes_permitter
.
permitted_attributes_defined?
(
importable_class_sym
)
if
attributes_permitter
.
permitted_attributes_defined?
(
importable_class_sym
)
attributes_permitter
.
permit
(
importable_class_sym
,
params
)
attributes_permitter
.
permit
(
importable_class_sym
,
params
)
else
else
Gitlab
::
ImportExport
::
AttributeCleaner
.
clean
(
Gitlab
::
ImportExport
::
AttributeCleaner
.
clean
(
...
@@ -132,10 +132,6 @@ module Gitlab
...
@@ -132,10 +132,6 @@ module Gitlab
@attributes_permitter
||=
Gitlab
::
ImportExport
::
AttributesPermitter
.
new
@attributes_permitter
||=
Gitlab
::
ImportExport
::
AttributesPermitter
.
new
end
end
def
use_attributes_permitter?
Feature
.
enabled?
(
:permitted_attributes_for_import_export
,
default_enabled: :yaml
)
end
def
present_override_params
def
present_override_params
# we filter out the empty strings from the overrides
# we filter out the empty strings from the overrides
# keeping the default values configured
# keeping the default values configured
...
...
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