diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2018-03-09 12:36:26 -0300 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2018-03-09 12:36:26 -0300 |
| commit | 5596933b535d632cf3c8159889a72b1e98e4ec0a (patch) | |
| tree | 5edc39c0408a1e5bcbc13168dedbdabd1eba417f /app/assets/javascripts/main.js | |
| parent | da5694c5cbaf62d5568339efd1a6f340f97e6e53 (diff) | |
| parent | 3bbe60f8e802ce3d9da060a47b7f635dedba7370 (diff) | |
| download | gitlab-ce-docs-refactor-dev-guides.tar.gz | |
fix conflictdocs-refactor-dev-guides
Diffstat (limited to 'app/assets/javascripts/main.js')
| -rw-r--r-- | app/assets/javascripts/main.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 659dc9eaa1f..53b01cca1d3 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -36,8 +36,11 @@ import initBreadcrumbs from './breadcrumb'; import initDispatcher from './dispatcher'; -// eslint-disable-next-line global-require, import/no-commonjs -if (process.env.NODE_ENV !== 'production') require('./test_utils/'); +// inject test utilities if necessary +if (process.env.NODE_ENV !== 'production' && gon && gon.test_env) { + $.fx.off = true; + import(/* webpackMode: "eager" */ './test_utils/'); +} svg4everybody(); |