Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 2 deletions

diff --git a/config/application.rb b/config/application.rb
index 1d32ebcaa54..cad5c8bbe76 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -255,8 +255,8 @@ module Gitlab
     caching_config_hash[:compress] = false
     caching_config_hash[:namespace] = Gitlab::Redis::Cache::CACHE_NAMESPACE
     caching_config_hash[:expires_in] = 2.weeks # Cache should not grow forever
-    if Sidekiq.server? # threaded context
-      caching_config_hash[:pool_size] = Sidekiq.options[:concurrency] + 5
+    if Sidekiq.server? || defined?(::Puma) # threaded context
+      caching_config_hash[:pool_size] = Gitlab::Redis::Cache.pool_size
       caching_config_hash[:pool_timeout] = 1
     end
 
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 1bcd8b68ac9..9c7a3f42c97 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -300,6 +300,11 @@ module.exports = {
         to: path.join(ROOT_PATH, 'public/assets/webpack/cmaps/'),
       },
       {
+        from: path.join(ROOT_PATH, 'node_modules/@sourcegraph/code-host-integration/'),
+        to: path.join(ROOT_PATH, 'public/assets/webpack/sourcegraph/'),
+        ignore: ['package.json'],
+      },
+      {
         from: path.join(
           ROOT_PATH,
           'node_modules/@gitlab/visual-review-tools/dist/visual_review_toolbar.js',