Skip to content

G
gitlab-ce
Commit c2a4fb6e authored by GitLab Bot's avatar GitLab Bot
Browse files
Options

Automatic merge of gitlab-org/gitlab-ce master

parents 5224d952 2fd254c6
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
.gitlab/ci/frontend.gitlab-ci.yml
View file @ c2a4fb6e
......@@ -8,7 +8,7 @@
.use-pg: &use-pg
services:
- name: postgres:9.6.11
- name: postgres:9.6.14
command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
- name: redis:alpine
......
.gitlab/ci/rails.gitlab-ci.yml
View file @ c2a4fb6e
.use-pg: &use-pg
services:
- name: postgres:9.6.11
- name: postgres:9.6.14
command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
- name: redis:alpine
.use-pg-10: &use-pg-10
services:
- name: postgres:10.7
- name: postgres:10.9
command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
- name: redis:alpine
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7