diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-05-02 21:41:53 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-05-02 21:41:53 +0000 |
| commit | 206504008cb8dbcddd05545d71c644c059801250 (patch) | |
| tree | 4d9ea7bdfb4119006ccba308ece939fa917f9ce0 | |
| parent | 5d2f46a5921a96f348765be82dbc6e4d3e2dd08f (diff) | |
| parent | d2ed4884c10044a0fe907045c594a0d0985ab7da (diff) | |
| download | gitlab-ce-206504008cb8dbcddd05545d71c644c059801250.tar.gz | |
Merge branch 'use-pg-10.7' into 'master'
Use PostgreSQL 10.7 in tests
See merge request gitlab-org/gitlab-ce!28020
| -rw-r--r-- | .gitlab/ci/rails.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/use-pg-10-7.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 01e71a7faf1..35c5f67427e 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -6,7 +6,7 @@ .use-pg-10: &use-pg-10 services: - - postgres:10.0 + - postgres:10.7 - redis:alpine .use-mysql: &use-mysql diff --git a/changelogs/unreleased/use-pg-10-7.yml b/changelogs/unreleased/use-pg-10-7.yml new file mode 100644 index 00000000000..aa57c3a6a17 --- /dev/null +++ b/changelogs/unreleased/use-pg-10-7.yml @@ -0,0 +1,5 @@ +--- +title: Use PostgreSQL 10.7 in tests +merge_request: 28020 +author: +type: other |