BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
982c2b83
Commit
982c2b83
authored
Oct 04, 2017
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix static anlysys. Added safe_model_attributes.
parent
f4f9ee94
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
2 deletions
+32
-2
cluster.rb
app/models/gcp/cluster.rb
+4
-1
import_export.yml
lib/gitlab/import_export/import_export.yml
+1
-1
relation_factory.rb
lib/gitlab/import_export/relation_factory.rb
+1
-0
safe_model_attributes.yml
spec/lib/gitlab/import_export/safe_model_attributes.yml
+26
-0
No files found.
app/models/gcp/cluster.rb
View file @
982c2b83
...
...
@@ -48,7 +48,10 @@ module Gcp
validates
:gcp_cluster_zone
,
presence:
true
validates
:gcp_cluster_size
,
presence:
true
,
numericality:
{
only_integer:
true
,
greater_than:
0
}
numericality:
{
only_integer:
true
,
greater_than:
0
}
validates
:project_namespace
,
allow_blank:
true
,
...
...
lib/gitlab/import_export/import_export.yml
View file @
982c2b83
...
...
@@ -53,7 +53,7 @@ project_tree:
-
:auto_devops
-
:triggers
-
:pipeline_schedules
-
:cluster
s
-
:cluster
-
:services
-
:hooks
-
protected_branches
:
...
...
lib/gitlab/import_export/relation_factory.rb
View file @
982c2b83
...
...
@@ -8,6 +8,7 @@ module Gitlab
triggers:
'Ci::Trigger'
,
pipeline_schedules:
'Ci::PipelineSchedule'
,
builds:
'Ci::Build'
,
cluster:
'Gcp::Cluster'
,
clusters:
'Gcp::Cluster'
,
hooks:
'ProjectHook'
,
merge_access_levels:
'ProtectedBranch::MergeAccessLevel'
,
...
...
spec/lib/gitlab/import_export/safe_model_attributes.yml
View file @
982c2b83
...
...
@@ -310,6 +310,32 @@ Ci::PipelineSchedule:
-
deleted_at
-
created_at
-
updated_at
Gcp::Cluster
:
-
id
-
project_id
-
user_id
-
service_id
-
enabled
-
status
-
status_reason
-
project_namespace
-
endpoint
-
ca_cert
-
encrypted_kubernetes_token
-
encrypted_kubernetes_token_iv
-
username
-
encrypted_password
-
encrypted_password_iv
-
gcp_project_id
-
gcp_cluster_zone
-
gcp_cluster_name
-
gcp_cluster_size
-
gcp_machine_type
-
gcp_operation_id
-
encrypted_gcp_token
-
encrypted_gcp_token_iv
-
created_at
-
updated_at
DeployKey
:
-
id
-
user_id
...
...
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