diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-03 03:09:01 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-03 03:09:01 +0300 |
| commit | ff92da4f3468c342862dbcd5b69c01e86e2bcc3d (patch) | |
| tree | 2abc8ff1c86b90bcfd9b05709cf26b70c0f16675 /spec/lib | |
| parent | e7f5f860cfb0281e17a4d80cbe8507486614320f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib')
| -rw-r--r-- | spec/lib/gitlab/ci/templates/Terraform/base_latest_gitlab_ci_yaml_spec.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/import_export/all_models.yml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/spec/lib/gitlab/ci/templates/Terraform/base_latest_gitlab_ci_yaml_spec.rb b/spec/lib/gitlab/ci/templates/Terraform/base_latest_gitlab_ci_yaml_spec.rb index e35f2eabe8e..fbde160c196 100644 --- a/spec/lib/gitlab/ci/templates/Terraform/base_latest_gitlab_ci_yaml_spec.rb +++ b/spec/lib/gitlab/ci/templates/Terraform/base_latest_gitlab_ci_yaml_spec.rb @@ -19,7 +19,7 @@ RSpec.describe 'Terraform/Base.latest.gitlab-ci.yml' do allow(project).to receive(:default_branch).and_return(default_branch) end - it 'does not create any jobs' do + it 'does not create any jobs', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/339979' do expect(build_names).to be_empty end end diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml index be04bd2a3f0..51e60461390 100644 --- a/spec/lib/gitlab/import_export/all_models.yml +++ b/spec/lib/gitlab/import_export/all_models.yml @@ -589,6 +589,7 @@ project: - timelogs - error_tracking_errors - error_tracking_client_keys +- pending_builds award_emoji: - awardable - user |