diff options
| author | Phil Hughes <me@iamphill.com> | 2018-01-23 09:17:29 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-01-24 08:45:07 +0000 |
| commit | aaf03c0c4819a5839f2dbd5003a7ce066b68ee53 (patch) | |
| tree | 1e7d83edd3bae72502cd876cc8a308bf4b6aed76 | |
| parent | adf31a57f47215813e36c573c98bb11ab608cee9 (diff) | |
| download | gitlab-ce-aaf03c0c4819a5839f2dbd5003a7ce066b68ee53.tar.gz | |
correctly imports performance bar
| -rw-r--r-- | app/views/layouts/_head.html.haml | 1 | ||||
| -rw-r--r-- | config/webpack.config.js | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index 1597621fa78..ea13a5e6d62 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -43,7 +43,6 @@ = webpack_bundle_tag "main" = webpack_bundle_tag "raven" if current_application_settings.clientside_sentry_enabled = webpack_bundle_tag "test" if Rails.env.test? - = webpack_bundle_tag 'performance_bar' if performance_bar_enabled? - if content_for?(:page_specific_javascripts) = yield :page_specific_javascripts diff --git a/config/webpack.config.js b/config/webpack.config.js index 229db11acb2..26502efaf6c 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -85,7 +85,6 @@ var config = { test: './test.js', two_factor_auth: './two_factor_auth.js', users: './users/index.js', - performance_bar: './performance_bar.js', webpack_runtime: './webpack.js', }, @@ -119,9 +118,9 @@ var config = { { test: /\_worker\.js$/, use: [ - { + { loader: 'worker-loader', - options: { + options: { inline: true } }, |