diff options
| author | Adam Hegyi <ahegyi@gitlab.com> | 2019-08-14 05:12:51 +0000 |
|---|---|---|
| committer | Adam Hegyi <ahegyi@gitlab.com> | 2019-08-14 05:12:51 +0000 |
| commit | 60eb08db2e706b1072bc7cff1c69f5cd1a2cc5fa (patch) | |
| tree | fa11cb8049762e4a8d8825b9c7bfe68586910f48 /.gitlab-ci.yml | |
| parent | 707c334d2a1d6e8c482f97c66498fb6265f8e812 (diff) | |
| parent | f9290e5b5282c3a245a58716a609aa10a47e9f92 (diff) | |
| download | gitlab-ce-60eb08db2e706b1072bc7cff1c69f5cd1a2cc5fa.tar.gz | |
Resolve conflicts12502-add-view-stats-to-cycle-analytics
# Conflicts:
# lib/gitlab/usage_data.rb
# spec/lib/gitlab/usage_data_spec.rb
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 9531d10be05..f926cbc2939 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.3-golang-1.11-git-2.22-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.29" +image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.6.3-golang-1.11-git-2.22-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.33" variables: RAILS_ENV: "test" |