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
Jérome Perrin
gitlab-ce
Commits
ad62a25e
Commit
ad62a25e
authored
Sep 21, 2016
by
James Lopez
Committed by
Ruben Davila
Sep 21, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix import/export security specs after merge
parent
4e7eb309
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
1 deletion
+15
-1
lib/gitlab/import_export/import_export.yml
lib/gitlab/import_export/import_export.yml
+3
-0
spec/lib/gitlab/import_export/all_models.yml
spec/lib/gitlab/import_export/all_models.yml
+5
-1
spec/lib/gitlab/import_export/safe_model_attributes.yml
spec/lib/gitlab/import_export/safe_model_attributes.yml
+7
-0
No files found.
lib/gitlab/import_export/import_export.yml
View file @
ad62a25e
...
@@ -10,6 +10,7 @@ project_tree:
...
@@ -10,6 +10,7 @@ project_tree:
-
milestone
:
-
milestone
:
-
:events
-
:events
-
snippets
:
-
snippets
:
-
:award_emoji
-
notes
:
-
notes
:
:author
:author
-
:releases
-
:releases
...
@@ -66,6 +67,8 @@ excluded_attributes:
...
@@ -66,6 +67,8 @@ excluded_attributes:
-
:milestone_id
-
:milestone_id
merge_requests
:
merge_requests
:
-
:milestone_id
-
:milestone_id
award_emoji
:
-
:awardable_id
methods
:
methods
:
statuses
:
statuses
:
...
...
spec/lib/gitlab/import_export/all_models.yml
View file @
ad62a25e
...
@@ -49,6 +49,7 @@ snippets:
...
@@ -49,6 +49,7 @@ snippets:
-
author
-
author
-
project
-
project
-
notes
-
notes
-
award_emoji
releases
:
releases
:
-
project
-
project
project_members
:
project_members
:
...
@@ -180,4 +181,7 @@ project:
...
@@ -180,4 +181,7 @@ project:
-
triggers
-
triggers
-
environments
-
environments
-
deployments
-
deployments
-
project_feature
-
project_feature
\ No newline at end of file
award_emoji
:
-
awardable
-
user
\ No newline at end of file
spec/lib/gitlab/import_export/safe_model_attributes.yml
View file @
ad62a25e
...
@@ -321,3 +321,10 @@ ProtectedBranch::PushAccessLevel:
...
@@ -321,3 +321,10 @@ ProtectedBranch::PushAccessLevel:
-
access_level
-
access_level
-
created_at
-
created_at
-
updated_at
-
updated_at
AwardEmoji
:
-
id
-
user_id
-
name
-
awardable_type
-
created_at
-
updated_at
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