diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2017-05-07 22:35:56 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-07 22:35:56 +0000 |
| commit | 8df3997a92bffa2d29f3c559933a336b837cdb93 (patch) | |
| tree | 5ee50876b35b6c5fd40607665f72468cfcee51fe /lib | |
| parent | 8a0cde81feb3c8f3af26eefa5cef7b72eda2d266 (diff) | |
| download | gitlab-ce-8df3997a92bffa2d29f3c559933a336b837cdb93.tar.gz | |
Add Pipeline Schedules that supersedes experimental Trigger Schedule
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/import_export.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/import_export/import_export.yml | 6 | ||||
| -rw-r--r-- | lib/gitlab/import_export/relation_factory.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/usage_data.rb | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/lib/gitlab/import_export.rb b/lib/gitlab/import_export.rb index 8b327cfc226..27d5a9198b6 100644 --- a/lib/gitlab/import_export.rb +++ b/lib/gitlab/import_export.rb @@ -3,7 +3,7 @@ module Gitlab extend self # For every version update, the version history in import_export.md has to be kept up to date. - VERSION = '0.1.6'.freeze + VERSION = '0.1.7'.freeze FILENAME_LIMIT = 50 def export_path(relative_path:) diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml index 5f757f99fb3..89088ee8762 100644 --- a/lib/gitlab/import_export/import_export.yml +++ b/lib/gitlab/import_export/import_export.yml @@ -39,8 +39,8 @@ project_tree: - :author - :events - :statuses - - triggers: - - :trigger_schedule + - :triggers + - :pipeline_schedules - :services - :hooks - protected_branches: @@ -116,4 +116,4 @@ methods: merge_requests: - :diff_head_sha project: - - :description_html
\ No newline at end of file + - :description_html diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb index 956763fa399..19e23a4715f 100644 --- a/lib/gitlab/import_export/relation_factory.rb +++ b/lib/gitlab/import_export/relation_factory.rb @@ -5,7 +5,7 @@ module Gitlab pipelines: 'Ci::Pipeline', statuses: 'commit_status', triggers: 'Ci::Trigger', - trigger_schedule: 'Ci::TriggerSchedule', + pipeline_schedules: 'Ci::PipelineSchedule', builds: 'Ci::Build', hooks: 'ProjectHook', merge_access_levels: 'ProtectedBranch::MergeAccessLevel', diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb index 6aca6db3123..14d8e925d0e 100644 --- a/lib/gitlab/usage_data.rb +++ b/lib/gitlab/usage_data.rb @@ -23,6 +23,7 @@ module Gitlab ci_pipelines: ::Ci::Pipeline.count, ci_runners: ::Ci::Runner.count, ci_triggers: ::Ci::Trigger.count, + ci_pipeline_schedules: ::Ci::PipelineSchedule.count, deploy_keys: DeployKey.count, deployments: Deployment.count, environments: Environment.count, |