diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 18:09:35 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 18:09:35 +0000 |
| commit | 5bfb8d1fad825eec90b0af688c7cd1b352c9056e (patch) | |
| tree | 385411919c4186d11a769385ad8dafeef6cc36a7 /.gitlab | |
| parent | aaf59610548d9b0fd01acfd50e831cbe519ecba2 (diff) | |
| download | gitlab-ce-5bfb8d1fad825eec90b0af688c7cd1b352c9056e.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 19 | ||||
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/issue_templates/Security developer workflow.md | 2 |
3 files changed, 21 insertions, 2 deletions
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index f9074adeaba..82ce9310ee8 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -204,8 +204,25 @@ gitlab:setup: rspec:coverage: extends: - .rails-job-base - - .rails:rules:ee-and-foss + - .rails:rules:ee-only stage: post-test + # We cannot use needs since it would mean needing 84 jobs (since most are parallelized) + # so we use `dependencies` here. + dependencies: + - setup-test-env + - rspec migration pg9 + - rspec unit pg9 + - rspec integration pg9 + - rspec system pg9 + - rspec-ee migration pg9 + - rspec-ee unit pg9 + - rspec-ee integration pg9 + - rspec-ee system pg9 + - rspec-ee unit pg9 geo + - rspec-ee integration pg9 geo + - rspec-ee system pg9 geo + - memory-static + - memory-on-boot variables: SETUP_DB: "false" cache: diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 3ef28e02e9d..26138532f46 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -291,6 +291,8 @@ ############### .pages:rules: rules: + - <<: *if-not-ee + when: never - <<: *if-dot-com-gitlab-org-master changes: *code-backstage-qa-patterns when: on_success diff --git a/.gitlab/issue_templates/Security developer workflow.md b/.gitlab/issue_templates/Security developer workflow.md index 56be0453b33..2c80360d32d 100644 --- a/.gitlab/issue_templates/Security developer workflow.md +++ b/.gitlab/issue_templates/Security developer workflow.md @@ -21,7 +21,7 @@ Set the title to: `Description of the original issue` - [ ] Create a merge request targeting `master` on `gitlab.com/gitlab-org/security` and use the [Security Release merge request template]. - [ ] Follow the same [code review process]: Assign to a reviewer, then to a maintainer. -After your merge request has being approved according to our [approval guidelines], you're ready to prepare the backports +After your merge request has been approved according to our [approval guidelines], you're ready to prepare the backports ## Backports |