diff options
author | Clement Ho <ClemMakesApps@gmail.com> | 2018-01-08 12:59:19 -0600 |
---|---|---|
committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-01-08 12:59:19 -0600 |
commit | 606b5094c15f36ebd9d697440446c48b54d40e6c (patch) | |
tree | ddb7bf3dfa8d925c38307bca0ff8837cc9d3741f /app/models/ci/build.rb | |
parent | 7f7a18c0c37a11b1eba2ac5575087b7b85c3ec5f (diff) | |
parent | 1d7b46062feb1d93dd3efaf6ba4d5d934068342c (diff) | |
download | gitlab-ce-606b5094c15f36ebd9d697440446c48b54d40e6c.tar.gz |
Merge branch 'master' into improve-table-pagination-specimprove-table-pagination-spec
Diffstat (limited to 'app/models/ci/build.rb')
-rw-r--r-- | app/models/ci/build.rb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 83fe23606d1..6012dbba1b9 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -79,7 +79,7 @@ module Ci before_save :ensure_token before_destroy { unscoped_project } - after_create do |build| + after_create unless: :importing? do |build| run_after_commit { BuildHooksWorker.perform_async(build.id) } end @@ -461,7 +461,14 @@ module Ci end def cache - [options[:cache]] + cache = options[:cache] + + if cache && project.jobs_cache_index + cache = cache.merge( + key: "#{cache[:key]}:#{project.jobs_cache_index}") + end + + [cache] end def credentials |