Merge branch 'master' into 12513-make-dashboard-fast-again

[arvados.git] / apps / workbench / config / application.rb

diff --git a/apps/workbench/config/application.rb b/apps/workbench/config/application.rb
index d1c7934ab3ba16b57f61425edcc48a57b81df1e3..891dd432c0dccfedf4f773cd41748c0222124e88 100644 (file)
--- a/apps/workbench/config/application.rb
+++ b/apps/workbench/config/application.rb
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
@@ -48,6 +52,11 @@ module ArvadosWorkbench
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
+
+    # npm-rails loads top-level modules like window.Mithril, but we
+    # also pull in some code from node_modules in application.js, like
+    # mithril/stream/stream.
+    config.assets.paths << Rails.root.join('node_modules')
   end
 end