diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-04-06 13:40:30 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-04-06 13:40:30 +0000 |
| commit | 88f33a1266ca51d48272e858c399daedd837575f (patch) | |
| tree | 9c0da433d01a0cf01cdc0ded774c8b85a949403f /config/webpack.config.js | |
| parent | b3ea598b1aeaf7f3eb0071b60f97247ad67e69f4 (diff) | |
| parent | 8199ff7bd71ce91fbc945b2c31010fcf654bda67 (diff) | |
| download | gitlab-ce-update-trace-handling-code.tar.gz | |
Merge branch 'master' into 'update-trace-handling-code'update-trace-handling-code
# Conflicts:
# app/assets/javascripts/build.js
Diffstat (limited to 'config/webpack.config.js')
| -rw-r--r-- | config/webpack.config.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index 9b597f7a04e..dc431e4d566 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -42,10 +42,12 @@ var config = { profile: './profile/profile_bundle.js', protected_branches: './protected_branches/protected_branches_bundle.js', snippet: './snippet/snippet_bundle.js', + stl_viewer: './blob/stl_viewer.js', terminal: './terminal/terminal_bundle.js', u2f: ['vendor/u2f'], users: './users/users_bundle.js', vue_pipelines: './vue_pipelines_index/index.js', + issue_show: './issue_show/index.js', }, output: { |