diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-04-06 22:00:00 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-04-06 22:05:22 +0200 |
| commit | 37a7b099d6eafc87209368a9fc7f608282b99e08 (patch) | |
| tree | a2712e439cec8547d84bed2d57d339cb1cd5c502 /spec/lib/gitlab/import_export | |
| parent | 57c353fca7121a120142161b253004f33d815766 (diff) | |
| parent | 73cb71e41c0ade92b9673a5d74c7dd78679fae91 (diff) | |
| download | gitlab-ce-37a7b099d6eafc87209368a9fc7f608282b99e08.tar.gz | |
Merge remote-tracking branch 'origin/master' into optimise-pipelinesoptimise-pipelines
Diffstat (limited to 'spec/lib/gitlab/import_export')
| -rw-r--r-- | spec/lib/gitlab/import_export/all_models.yml | 11 | ||||
| -rw-r--r-- | spec/lib/gitlab/import_export/safe_model_attributes.yml | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml index 5a7e5fd4360..549eac76ced 100644 --- a/spec/lib/gitlab/import_export/all_models.yml +++ b/spec/lib/gitlab/import_export/all_models.yml @@ -104,6 +104,9 @@ triggers: - project - trigger_requests - owner +- trigger_schedule +trigger_schedule: +- trigger deploy_keys: - user - deploy_keys_projects @@ -121,6 +124,9 @@ merge_access_levels: - protected_branch push_access_levels: - protected_branch +container_repositories: +- project +- name project: - taggings - base_tags @@ -161,6 +167,8 @@ project: - external_wiki_service - kubernetes_service - mock_ci_service +- mock_deployment_service +- mock_monitoring_service - forked_project_link - forked_from_project - forked_project_links @@ -195,8 +203,10 @@ project: - builds - runner_projects - runners +- active_runners - variables - triggers +- trigger_schedules - environments - deployments - project_feature @@ -205,6 +215,7 @@ project: - project_authorizations - route - statistics +- container_repositories - uploads award_emoji: - awardable diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml index 1ad16a9b57d..0c43c5662e8 100644 --- a/spec/lib/gitlab/import_export/safe_model_attributes.yml +++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml @@ -240,6 +240,17 @@ Ci::Trigger: - updated_at - owner_id - description +- ref +Ci::TriggerSchedule: +- id +- project_id +- trigger_id +- deleted_at +- created_at +- updated_at +- cron +- cron_timezone +- next_run_at DeployKey: - id - user_id |