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
28acc1c0
Commit
28acc1c0
authored
Dec 17, 2019
by
nmilojevic1
Committed by
Stan Hu
Dec 17, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add discussion_id to AllowedReferences
parent
3a8e52d5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
21 deletions
+1
-21
lib/gitlab/import_export/attribute_cleaner.rb
lib/gitlab/import_export/attribute_cleaner.rb
+1
-1
lib/gitlab/import_export/import_export.yml
lib/gitlab/import_export/import_export.yml
+0
-1
spec/lib/gitlab/import_export/safe_model_attributes.yml
spec/lib/gitlab/import_export/safe_model_attributes.yml
+0
-19
No files found.
lib/gitlab/import_export/attribute_cleaner.rb
View file @
28acc1c0
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
module
Gitlab
module
Gitlab
module
ImportExport
module
ImportExport
class
AttributeCleaner
class
AttributeCleaner
ALLOWED_REFERENCES
=
RelationFactory
::
PROJECT_REFERENCES
+
RelationFactory
::
USER_REFERENCES
+
%w[group_id commit_id]
ALLOWED_REFERENCES
=
RelationFactory
::
PROJECT_REFERENCES
+
RelationFactory
::
USER_REFERENCES
+
%w[group_id commit_id
discussion_id
]
PROHIBITED_REFERENCES
=
Regexp
.
union
(
/\Acached_markdown_version\Z/
,
/_id\Z/
,
/_ids\Z/
,
/_html\Z/
).
freeze
PROHIBITED_REFERENCES
=
Regexp
.
union
(
/\Acached_markdown_version\Z/
,
/_id\Z/
,
/_ids\Z/
,
/_html\Z/
).
freeze
def
self
.
clean
(
*
args
)
def
self
.
clean
(
*
args
)
...
...
lib/gitlab/import_export/import_export.yml
View file @
28acc1c0
...
@@ -256,7 +256,6 @@ excluded_attributes:
...
@@ -256,7 +256,6 @@ excluded_attributes:
-
:merge_request_id
-
:merge_request_id
notes
:
notes
:
-
:noteable_id
-
:noteable_id
-
:discussion_id
-
:review_id
-
:review_id
label_links
:
label_links
:
-
:label_id
-
:label_id
...
...
spec/lib/gitlab/import_export/safe_model_attributes.yml
View file @
28acc1c0
...
@@ -33,7 +33,6 @@ Issue:
...
@@ -33,7 +33,6 @@ Issue:
Event
:
Event
:
-
id
-
id
-
target_type
-
target_type
-
target_id
-
project_id
-
project_id
-
group_id
-
group_id
-
created_at
-
created_at
...
@@ -60,7 +59,6 @@ Note:
...
@@ -60,7 +59,6 @@ Note:
-
attachment
-
attachment
-
line_code
-
line_code
-
commit_id
-
commit_id
-
noteable_id
-
system
-
system
-
st_diff
-
st_diff
-
updated_by_id
-
updated_by_id
...
@@ -73,11 +71,8 @@ Note:
...
@@ -73,11 +71,8 @@ Note:
-
resolved_by_push
-
resolved_by_push
-
discussion_id
-
discussion_id
-
original_discussion_id
-
original_discussion_id
-
review_id
LabelLink
:
LabelLink
:
-
id
-
id
-
label_id
-
target_id
-
target_type
-
target_type
-
created_at
-
created_at
-
updated_at
-
updated_at
...
@@ -130,13 +125,11 @@ Release:
...
@@ -130,13 +125,11 @@ Release:
-
released_at
-
released_at
Evidence
:
Evidence
:
-
id
-
id
-
release_id
-
summary
-
summary
-
created_at
-
created_at
-
updated_at
-
updated_at
Releases::Link:
Releases::Link:
-
id
-
id
-
release_id
-
url
-
url
-
name
-
name
-
created_at
-
created_at
...
@@ -144,7 +137,6 @@ Releases::Link:
...
@@ -144,7 +137,6 @@ Releases::Link:
ProjectMember
:
ProjectMember
:
-
id
-
id
-
access_level
-
access_level
-
source_id
-
source_type
-
source_type
-
user_id
-
user_id
-
notification_level
-
notification_level
...
@@ -600,7 +592,6 @@ AwardEmoji:
...
@@ -600,7 +592,6 @@ AwardEmoji:
LabelPriority
:
LabelPriority
:
-
id
-
id
-
project_id
-
project_id
-
label_id
-
priority
-
priority
-
created_at
-
created_at
-
updated_at
-
updated_at
...
@@ -608,7 +599,6 @@ Timelog:
...
@@ -608,7 +599,6 @@ Timelog:
-
id
-
id
-
time_spent
-
time_spent
-
merge_request_id
-
merge_request_id
-
issue_id
-
user_id
-
user_id
-
spent_at
-
spent_at
-
created_at
-
created_at
...
@@ -623,7 +613,6 @@ ProjectAutoDevops:
...
@@ -623,7 +613,6 @@ ProjectAutoDevops:
-
updated_at
-
updated_at
IssueAssignee
:
IssueAssignee
:
-
user_id
-
user_id
-
issue_id
ProjectCustomAttribute
:
ProjectCustomAttribute
:
-
id
-
id
-
created_at
-
created_at
...
@@ -679,7 +668,6 @@ ProtectedEnvironment::DeployAccessLevel:
...
@@ -679,7 +668,6 @@ ProtectedEnvironment::DeployAccessLevel:
ResourceLabelEvent
:
ResourceLabelEvent
:
-
id
-
id
-
action
-
action
-
issue_id
-
merge_request_id
-
merge_request_id
-
label_id
-
label_id
-
user_id
-
user_id
...
@@ -691,11 +679,9 @@ ErrorTracking::ProjectErrorTrackingSetting:
...
@@ -691,11 +679,9 @@ ErrorTracking::ProjectErrorTrackingSetting:
-
organization_name
-
organization_name
SentryIssue
:
SentryIssue
:
-
id
-
id
-
issue_id
-
sentry_issue_identifier
-
sentry_issue_identifier
Suggestion
:
Suggestion
:
-
id
-
id
-
note_id
-
relative_order
-
relative_order
-
applied
-
applied
-
commit_id
-
commit_id
...
@@ -750,21 +736,16 @@ ExternalPullRequest:
...
@@ -750,21 +736,16 @@ ExternalPullRequest:
DesignManagement::Design:
DesignManagement::Design:
-
id
-
id
-
project_id
-
project_id
-
issue_id
-
filename
-
filename
DesignManagement::Action:
DesignManagement::Action:
-
design_id
-
event
-
event
-
version_id
DesignManagement::Version:
DesignManagement::Version:
-
id
-
id
-
created_at
-
created_at
-
sha
-
sha
-
issue_id
-
author_id
-
author_id
ZoomMeeting
:
ZoomMeeting
:
-
id
-
id
-
issue_id
-
project_id
-
project_id
-
issue_status
-
issue_status
-
url
-
url
...
...
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