Merge remote-tracking branch 'origin/master' into fix_tournament_load_times
This commit is contained in:
commit
b617593f89
|
|
@ -12,6 +12,8 @@ include:
|
||||||
|
|
||||||
rails spec:
|
rails spec:
|
||||||
stage: test
|
stage: test
|
||||||
|
tags:
|
||||||
|
- docker
|
||||||
image: $CI_REGISTRY_IMAGE/test/commits:$CI_COMMIT_SHA
|
image: $CI_REGISTRY_IMAGE/test/commits:$CI_COMMIT_SHA
|
||||||
rules:
|
rules:
|
||||||
- if: $SKIP_TEST
|
- if: $SKIP_TEST
|
||||||
|
|
@ -30,6 +32,8 @@ rails spec:
|
||||||
|
|
||||||
rails e2e spec:
|
rails e2e spec:
|
||||||
stage: test
|
stage: test
|
||||||
|
tags:
|
||||||
|
- docker
|
||||||
image: $CI_REGISTRY_IMAGE/test/commits:$CI_COMMIT_SHA
|
image: $CI_REGISTRY_IMAGE/test/commits:$CI_COMMIT_SHA
|
||||||
services:
|
services:
|
||||||
- name: postgres:16
|
- name: postgres:16
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue