diff options
| author | Shinya Maeda <gitlab.shinyamaeda@gmail.com> | 2017-04-01 14:27:37 +0300 |
|---|---|---|
| committer | Shinya Maeda <gitlab.shinyamaeda@gmail.com> | 2017-04-06 17:46:58 +0300 |
| commit | 01cea0d59dd52ab6db2c7fb19faa2b8c71cf6052 (patch) | |
| tree | ac14818bb92f4c370b919d99767b4d12b44a3f77 | |
| parent | b5f252bdf53365b02bea4415b0b8581ad59d0587 (diff) | |
Suppress Import/Export function warnings. Add comment for confirmation.
| -rw-r--r-- | lib/gitlab/import_export/import_export.yml | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/import_export/all_models.yml | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/import_export/safe_model_attributes.yml | 10 |
3 files changed, 13 insertions, 1 deletions
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml index f69288f7d67..8d74418ed14 100644 --- a/lib/gitlab/import_export/import_export.yml +++ b/lib/gitlab/import_export/import_export.yml @@ -39,7 +39,7 @@ project_tree: - :author - :events - :statuses - - :triggers + - :triggers # TODO: Need to confirm - :deploy_keys - :services - :hooks diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml index 24654bf6afd..06e8cd5a1cd 100644 --- a/spec/lib/gitlab/import_export/all_models.yml +++ b/spec/lib/gitlab/import_export/all_models.yml @@ -99,6 +99,7 @@ triggers: - project - trigger_requests - owner +- trigger_schedule deploy_keys: - user - deploy_keys_projects @@ -194,6 +195,7 @@ project: - runners - variables - triggers +- trigger_schedules - environments - deployments - project_feature diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml index 1ad16a9b57d..ecd8f2990c6 100644 --- a/spec/lib/gitlab/import_export/safe_model_attributes.yml +++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml @@ -240,6 +240,16 @@ Ci::Trigger: - updated_at - owner_id - description +- ref +Ci::TriggerSchedule: +- id +- project_id +- trigger_id +- deleted_at +- created_at +- updated_at +- cron +- next_run_at DeployKey: - id - user_id |