Add latest changes from gitlab-org/gitlab@master

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 }