Commit cd9e3885 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'fix/import-security-specs' into 'master'

Fix Import/Export security specs

Related https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1987#note_83855

See merge request !1997
parents 870324b5 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
......
...@@ -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
......
...@@ -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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment