diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-04-12 18:46:50 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-12 18:46:50 +0800 |
| commit | e1bc7577a4b83f729fae02c1fbdac9d066c93a51 (patch) | |
| tree | 9281ff73ddc53ecbe91d71c987ac0adca5939fb5 /.gitlab-ci.yml | |
| parent | d6c454572199eea8773f520b93a1260ab40baca7 (diff) | |
| parent | 59f81b4ff80862fb7649eba461ba588d6cfee9ec (diff) | |
| download | gitlab-ce-e1bc7577a4b83f729fae02c1fbdac9d066c93a51.tar.gz | |
Merge remote-tracking branch 'upstream/master' into test-pg-mysql
* upstream/master:
Setup and run a Gitaly server for testing if GitalyClient is enabled
Update changelog with MR id
Move permission to create subgroup into GroupPolicy
Fix issue's note cache expiration after delete
fix(subgroups): add verification of group creation capability to subgroup UI
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0c37b222232..2807274cb13 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6" +image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6" cache: key: "ruby-233" |