diff options
| author | Lukas Eipert <leipert@gitlab.com> | 2019-02-08 13:11:15 +0100 |
|---|---|---|
| committer | Lukas Eipert <leipert@gitlab.com> | 2019-02-08 13:14:39 +0100 |
| commit | 8ccf1ea3103719962c7f026307de72f2ade5fa4f (patch) | |
| tree | 0cc44e237123598ec2915ac4994bdeda068a914c /lib | |
| parent | acb939d7e9009b178d29fbcd4b286dadec547acb (diff) | |
| download | gitlab-ce-8ccf1ea3103719962c7f026307de72f2ade5fa4f.tar.gz | |
Use correct integrity hash for sprockets caching57431-sprockets-caches-files-independent-of-content
Use self.integrity_uri over self.hexdigest_integrity_uri(digest), as the
latter always returned nil leading to improper cache invalidation.
We are alos enabling caching of `tmp/cache/assets/sprockets` again, to
get those performance gains.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/patch/sprockets_base_file_digest_key.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/patch/sprockets_base_file_digest_key.rb b/lib/gitlab/patch/sprockets_base_file_digest_key.rb index 3925cdbbada..1c472638145 100644 --- a/lib/gitlab/patch/sprockets_base_file_digest_key.rb +++ b/lib/gitlab/patch/sprockets_base_file_digest_key.rb @@ -9,7 +9,7 @@ module Gitlab def file_digest(path) if stat = self.stat(path) digest = self.stat_digest(path, stat) - integrity_uri = self.hexdigest_integrity_uri(digest) + integrity_uri = self.integrity_uri(digest) key = Sprockets::UnloadedAsset.new(path, self).file_digest_key(integrity_uri) cache.fetch(key) do |