diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2017-12-22 23:06:15 +0100 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2017-12-22 23:06:15 +0100 |
| commit | 771b97394a16ae8dcd9acc84ab6a076f68726fd9 (patch) | |
| tree | 30624bc5739274878cd0161d3cbf43b67d64c241 /app/models/ci | |
| parent | 0a002e230badf96f5c89d55945ddd85113edd628 (diff) | |
| download | gitlab-ce-771b97394a16ae8dcd9acc84ab6a076f68726fd9.tar.gz | |
Use Project.cache_index in Build#cache
Diffstat (limited to 'app/models/ci')
| -rw-r--r-- | app/models/ci/build.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 83fe23606d1..e4ca74f87f2 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -461,7 +461,11 @@ module Ci end def cache - [options[:cache]] + if options[:cache] && project.cache_index + options[:cache].merge(key: "#{options[:cache][:key]}:#{project.cache_index}") + else + [options[:cache]] + end end def credentials |