summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-01-25 18:44:06 +0000
committerRobert Speicher <robert@gitlab.com>2018-01-25 18:44:06 +0000
commit491fb6a421320d0b013979507d85fc78264d7c01 (patch)
tree7e17f47e03dd8e11e51c166a7ad55c7511fded12 /.gitlab-ci.yml
parent9409c82fc274427b33749bda0f9120e6b93cee87 (diff)
parent76b0a2fbbc0b0f50450185917191a1d6d81725e2 (diff)
downloadgitlab-ce-491fb6a421320d0b013979507d85fc78264d7c01.tar.gz
Merge branch '34952-only-tags-is-not-taken-in-account-in-the-cache-gems-job' into 'master'
Resolve "`only: - tags` is not taken in account in the `cache gems` job" Closes #34952 See merge request gitlab-org/gitlab-ce!16721
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml3
1 files changed, 1 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1b409cca95c..c1d78ef2d48 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -722,8 +722,6 @@ pages:
cache gems:
<<: *dedicated-runner
<<: *pull-cache
- only:
- - tags
variables:
SETUP_DB: "false"
script:
@@ -734,6 +732,7 @@ cache gems:
only:
- master@gitlab-org/gitlab-ce
- master@gitlab-org/gitlab-ee
+ - tags
gitlab_git_test:
<<: *dedicated-runner