Merge branch 'master' into 'backstage/gb/build-stages-catch-up-migration'

 Conflicts:
   db/schema.rb

1 files changed, 21 insertions, 0 deletions

diff --git a/config/webpack.config.js b/config/webpack.config.js
index 7f3fe551a03..a4e6c64fce5 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -154,6 +154,27 @@ var config = {
         }
       },
       {
+        test: /katex.css$/,
+        include: /node_modules\/katex\/dist/,
+        use: [
+          { loader: 'style-loader' },
+          { 
+            loader: 'css-loader',
+            options: {
+              name: '[name].[hash].[ext]'
+            }
+          },
+        ],
+      },
+      {
+        test: /\.(eot|ttf|woff|woff2)$/,
+        include: /node_modules\/katex\/dist\/fonts/,
+        loader: 'file-loader',
+        options: {
+          name: '[name].[hash].[ext]',
+        }
+      },
+      {
         test: /monaco-editor\/\w+\/vs\/loader\.js$/,
         use: [
           { loader: 'exports-loader', options: 'l.global' },