diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-19 03:10:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-19 03:10:34 +0300 |
| commit | 57a4861dd1841a53cb966b566b1eee4adb254675 (patch) | |
| tree | 14f31aaf16966c72cb68a8434bee279877b701b3 /config | |
| parent | bfce95a4c5e9d71ed523f48f3fb901d2b7af60f7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/import.rb | 2 | ||||
| -rw-r--r-- | config/webpack.config.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/routes/import.rb b/config/routes/import.rb index 94c69b57e2d..0d3f202ba55 100644 --- a/config/routes/import.rb +++ b/config/routes/import.rb @@ -71,7 +71,7 @@ namespace :import do resource :manifest, only: [:create, :new], controller: :manifest do get :status - get :jobs + get :realtime_changes post :upload end diff --git a/config/webpack.config.js b/config/webpack.config.js index 374b8fdbbc3..49e865d668d 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -278,7 +278,7 @@ module.exports = { monaco: { priority: 15, name: 'monaco', - chunks: 'initial', + chunks: 'all', test: /[\\/]node_modules[\\/]monaco-editor[\\/]/, minChunks: 2, reuseExistingChunk: true, |