diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2018-03-01 18:14:53 +0000 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2018-03-01 18:14:53 +0000 |
commit | 119cdf3b3b56aa3c237b070ffde856f09992a8a1 (patch) | |
tree | 02e6cd5efb2a7f2f2247da0ca811ef70c54f40a9 /spec/javascripts/test_bundle.js | |
parent | 56e106d47f76c8692bfc2acdd018f5b2d11afd95 (diff) | |
parent | bb41a889487463f626796a390148ae7870c16824 (diff) | |
download | gitlab-ce-webpack-registry.tar.gz |
Merge branch 'master' into 'webpack-registry'webpack-registry
# Conflicts:
# config/webpack.config.js
Diffstat (limited to 'spec/javascripts/test_bundle.js')
-rw-r--r-- | spec/javascripts/test_bundle.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/javascripts/test_bundle.js b/spec/javascripts/test_bundle.js index fb4946aeeea..1bcfdfe72b6 100644 --- a/spec/javascripts/test_bundle.js +++ b/spec/javascripts/test_bundle.js @@ -37,6 +37,7 @@ window.$ = window.jQuery = $; window.gl = window.gl || {}; window.gl.TEST_HOST = 'http://test.host'; window.gon = window.gon || {}; +window.gon.test_env = true; let hasUnhandledPromiseRejections = false; |