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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
0aff6238
Commit
0aff6238
authored
May 01, 2019
by
charlieablett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change `prohibited_key` to use regexes
parent
4b46b530
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
4 deletions
+2
-4
lib/gitlab/import_export/attribute_cleaner.rb
lib/gitlab/import_export/attribute_cleaner.rb
+2
-4
No files found.
lib/gitlab/import_export/attribute_cleaner.rb
View file @
0aff6238
...
...
@@ -4,7 +4,7 @@ module Gitlab
module
ImportExport
class
AttributeCleaner
ALLOWED_REFERENCES
=
RelationFactory
::
PROJECT_REFERENCES
+
RelationFactory
::
USER_REFERENCES
+
[
'group_id'
]
PROHIBITED_
SUFFIXES
=
%w[_id _html]
.
freeze
PROHIBITED_
REFERENCES
=
Regexp
.
union
(
/\Acached_markdown_version\Z/
,
/_id\Z/
,
/_html\Z/
)
.
freeze
def
self
.
clean
(
*
args
)
new
(
*
args
).
clean
...
...
@@ -25,9 +25,7 @@ module Gitlab
private
def
prohibited_key?
(
key
)
return
false
if
permitted_key?
(
key
)
'cached_markdown_version'
==
key
||
PROHIBITED_SUFFIXES
.
any?
{
|
suffix
|
key
.
end_with?
(
suffix
)}
key
=~
PROHIBITED_REFERENCES
&&
!
permitted_key?
(
key
)
end
def
permitted_key?
(
key
)
...
...
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