diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2016-12-29 15:42:48 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-01-10 12:30:40 -0600 |
| commit | 7c47cc94c5d7425583db3610c85cb150df601a91 (patch) | |
| tree | 2544c6ac133e4abba79dcacb2a10df24e79224d6 /config/webpack.config.js | |
| parent | 3eb8569778ce2559eedab706f6f901238e39b355 (diff) | |
| download | gitlab-ce-7c47cc94c5d7425583db3610c85cb150df601a91.tar.gz | |
Swapped out teaspoon for karma
Diffstat (limited to 'config/webpack.config.js')
| -rw-r--r-- | config/webpack.config.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index da2a19838e4..5cba995888a 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -58,7 +58,7 @@ var config = { { test: /\.(js|es6)$/, loader: 'imports-loader', - query: 'this=>window' + query: '$=jquery,jQuery=jquery,this=>window' }, { test: /\.json$/, @@ -87,7 +87,10 @@ var config = { 'vendor': path.join(ROOT_PATH, 'vendor/assets/javascripts'), 'vue$': 'vue/dist/vue.js', 'vue-resource$': 'vue-resource/dist/vue-resource.js' - } + }, + root: [ + path.join(ROOT_PATH, 'app/assets/javascripts'), + ], } } |