diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-20 00:09:06 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-20 00:09:06 +0300 |
| commit | a7d1db72c912ef512c25724392f1c903e8d3bd7e (patch) | |
| tree | 15c9ca0c24a94aff8ca33cdd2212f9a2997d5571 /spec | |
| parent | 33795139ea8e72756bee3675b4e16387425e6ab1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/frontend/create_cluster/gke_cluster/stores/mutations_spec.js (renamed from spec/javascripts/create_cluster/gke_cluster/stores/mutations_spec.js) | 0 | ||||
| -rw-r--r-- | spec/lib/gitlab/ci/yaml_processor_spec.rb | 1 |
2 files changed, 1 insertions, 0 deletions
diff --git a/spec/javascripts/create_cluster/gke_cluster/stores/mutations_spec.js b/spec/frontend/create_cluster/gke_cluster/stores/mutations_spec.js index 7ee6ff436e2..7ee6ff436e2 100644 --- a/spec/javascripts/create_cluster/gke_cluster/stores/mutations_spec.js +++ b/spec/frontend/create_cluster/gke_cluster/stores/mutations_spec.js diff --git a/spec/lib/gitlab/ci/yaml_processor_spec.rb b/spec/lib/gitlab/ci/yaml_processor_spec.rb index e81aeb620c3..cfc3d852de0 100644 --- a/spec/lib/gitlab/ci/yaml_processor_spec.rb +++ b/spec/lib/gitlab/ci/yaml_processor_spec.rb @@ -101,6 +101,7 @@ module Gitlab name: "rspec", only: { refs: %w[branches tags] }, options: { script: ["rspec"] }, + scheduling_type: :stage, tag_list: %w[A B], allow_failure: false, when: "on_success", |