diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 22:34:23 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 22:34:23 +0300 |
| commit | 6438df3a1e0fb944485cebf07976160184697d72 (patch) | |
| tree | 00b09bfd170e77ae9391b1a2f5a93ef6839f2597 /lib/gitlab/webpack | |
| parent | 42bcd54d971da7ef2854b896a7b34f4ef8601067 (diff) | |
Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42
Diffstat (limited to 'lib/gitlab/webpack')
| -rw-r--r-- | lib/gitlab/webpack/manifest.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/webpack/manifest.rb b/lib/gitlab/webpack/manifest.rb index 5873d9c2b99..9c967d99e3a 100644 --- a/lib/gitlab/webpack/manifest.rb +++ b/lib/gitlab/webpack/manifest.rb @@ -69,8 +69,8 @@ module Gitlab def manifest if Gitlab.config.webpack.dev_server.enabled - # Don't cache if we're in dev server mode, manifest may change ... - load_manifest + # Only cache at request level if we're in dev server mode, manifest may change ... + Gitlab::SafeRequestStore.fetch('manifest.json') { load_manifest } else # ... otherwise cache at class level, as JSON loading/parsing can be expensive strong_memoize(:manifest) { load_manifest } |