diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-11-10 18:36:46 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-11-10 18:36:46 +0000 |
| commit | 3093c20824b6ee60c31f7173a149e2469c2a4820 (patch) | |
| tree | 6c6bef0ea63673cab16136b03fda50f3343f2c96 /config | |
| parent | cfd8c605704dab0bfe649c38059dcc7a4d68e9db (diff) | |
| download | gitlab-ce-3093c20824b6ee60c31f7173a149e2469c2a4820.tar.gz | |
Revert "Merge branch 'add-typescript' into 'master'"
This reverts merge request !15264
Diffstat (limited to 'config')
| -rw-r--r-- | config/webpack.config.js | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index 67d7cae3ccf..f7a7182a627 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -108,10 +108,6 @@ var config = { loader: 'vue-loader', }, { - test: /\.ts$/, - loader: 'ts-loader', - }, - { test: /\.svg$/, loader: 'raw-loader', }, @@ -256,7 +252,7 @@ var config = { ], resolve: { - extensions: ['.js', '.ts'], + extensions: ['.js'], alias: { '~': path.join(ROOT_PATH, 'app/assets/javascripts'), 'emojis': path.join(ROOT_PATH, 'fixtures/emojis'), |