diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-17 18:08:37 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-17 18:08:37 +0300 |
| commit | 37eff29d5ce44899e34c7c2ac319b314f2f26d15 (patch) | |
| tree | b74e1632fdb58ea10972f270bfec70a4e6ee07b0 /spec/lib | |
| parent | 9411a664118a3247d0a56baf7e7ef4549c1201c3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib')
| -rw-r--r-- | spec/lib/gitlab/badge/coverage/report_spec.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/import_export/all_models.yml | 1 | ||||
| -rw-r--r-- | spec/lib/gitlab/import_export/safe_model_attributes.yml | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/spec/lib/gitlab/badge/coverage/report_spec.rb b/spec/lib/gitlab/badge/coverage/report_spec.rb index eee3f96ab85..560072a3d83 100644 --- a/spec/lib/gitlab/badge/coverage/report_spec.rb +++ b/spec/lib/gitlab/badge/coverage/report_spec.rb @@ -102,7 +102,7 @@ describe Gitlab::Badge::Coverage::Report do create(:ci_pipeline, opts).tap do |pipeline| yield pipeline - pipeline.update_status + pipeline.update_legacy_status end end end diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml index ce7894ea955..08e57e541a4 100644 --- a/spec/lib/gitlab/import_export/all_models.yml +++ b/spec/lib/gitlab/import_export/all_models.yml @@ -216,6 +216,7 @@ stages: - project - pipeline - statuses +- processables - builds - bridges statuses: diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml index c921e7cadde..01beb5ba33c 100644 --- a/spec/lib/gitlab/import_export/safe_model_attributes.yml +++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml @@ -333,6 +333,7 @@ CommitStatus: - scheduled_at - upstream_pipeline_id - interruptible +- processed Ci::Variable: - id - project_id |