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
Boxiang Sun
gitlab-ce
Commits
ce48a595
Commit
ce48a595
authored
Sep 21, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixing security specs after merge
parent
a25ac8a8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
2 deletions
+23
-2
spec/features/projects/import_export/export_file_spec.rb
spec/features/projects/import_export/export_file_spec.rb
+1
-1
spec/lib/gitlab/import_export/all_models.yml
spec/lib/gitlab/import_export/all_models.yml
+8
-0
spec/lib/gitlab/import_export/safe_model_attributes.yml
spec/lib/gitlab/import_export/safe_model_attributes.yml
+14
-1
No files found.
spec/features/projects/import_export/export_file_spec.rb
View file @
ce48a595
...
@@ -15,7 +15,7 @@ feature 'Import/Export - project export integration test', feature: true, js: tr
...
@@ -15,7 +15,7 @@ feature 'Import/Export - project export integration test', feature: true, js: tr
let
(
:sensitive_words
)
{
%w[pass secret token key]
}
let
(
:sensitive_words
)
{
%w[pass secret token key]
}
let
(
:safe_list
)
do
let
(
:safe_list
)
do
{
{
token:
[
ProjectHook
,
Ci
::
Trigger
],
token:
[
ProjectHook
,
Ci
::
Trigger
,
CommitStatus
],
key:
[
Project
,
Ci
::
Variable
,
:yaml_variables
]
key:
[
Project
,
Ci
::
Variable
,
:yaml_variables
]
}
}
end
end
...
...
spec/lib/gitlab/import_export/all_models.yml
View file @
ce48a595
...
@@ -13,6 +13,8 @@ issues:
...
@@ -13,6 +13,8 @@ issues:
-
user_agent_detail
-
user_agent_detail
-
moved_to
-
moved_to
-
events
-
events
-
merge_requests_closing_issues
-
metrics
events
:
events
:
-
author
-
author
-
project
-
project
...
@@ -71,6 +73,8 @@ merge_requests:
...
@@ -71,6 +73,8 @@ merge_requests:
-
merge_request_diffs
-
merge_request_diffs
-
merge_request_diff
-
merge_request_diff
-
events
-
events
-
merge_requests_closing_issues
-
metrics
merge_request_diff
:
merge_request_diff
:
-
merge_request
-
merge_request
pipelines
:
pipelines
:
...
@@ -101,6 +105,10 @@ protected_branches:
...
@@ -101,6 +105,10 @@ protected_branches:
-
project
-
project
-
merge_access_levels
-
merge_access_levels
-
push_access_levels
-
push_access_levels
merge_access_levels
:
-
protected_branch
push_access_levels
:
-
protected_branch
project
:
project
:
-
taggings
-
taggings
-
base_tags
-
base_tags
...
...
spec/lib/gitlab/import_export/safe_model_attributes.yml
View file @
ce48a595
...
@@ -214,6 +214,7 @@ CommitStatus:
...
@@ -214,6 +214,7 @@ CommitStatus:
-
when
-
when
-
yaml_variables
-
yaml_variables
-
queued_at
-
queued_at
-
token
Ci::Variable:
Ci::Variable:
-
id
-
id
-
project_id
-
project_id
...
@@ -307,4 +308,16 @@ ProjectFeature:
...
@@ -307,4 +308,16 @@ ProjectFeature:
-
snippets_access_level
-
snippets_access_level
-
builds_access_level
-
builds_access_level
-
created_at
-
created_at
-
updated_at
-
updated_at
\ No newline at end of file
ProtectedBranch::MergeAccessLevel:
-
id
-
protected_branch_id
-
access_level
-
created_at
-
updated_at
ProtectedBranch::PushAccessLevel:
-
id
-
protected_branch_id
-
access_level
-
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