diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-07 03:09:26 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-07 03:09:26 +0300 |
| commit | 418a39f6c20ebaf9572c4ef3ae924b0c6ffc5e3b (patch) | |
| tree | c4ae73eee4e0a2ba535e87893858d9e76778d09d /.gitlab | |
| parent | 2633d5ef5ed868eccb174c6ff644a3fb8224f990 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 11 | ||||
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 5 |
2 files changed, 0 insertions, 16 deletions
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 4a22942e360..bb28bdbd326 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -257,17 +257,6 @@ static-analysis: - run_timed_command "retry yarn install --frozen-lockfile" - scripts/static-analysis -downtime_check: - extends: - - .rails-job-base - - .rails:rules:downtime_check - needs: [] - stage: test - variables: - SETUP_DB: "false" - script: - - bundle exec rake downtime_check - rspec migration pg11: extends: - .rspec-base-pg11 diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 72c700e9f4a..8062f3d59cb 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -880,11 +880,6 @@ changes: *code-backstage-patterns when: on_failure -.rails:rules:downtime_check: - rules: - - <<: *if-merge-request - changes: *code-backstage-patterns - .rails:rules:deprecations: rules: - <<: *if-not-ee |