Merge branch 'master' into 'issue_38337'

# Conflicts:
#   app/models/group.rb
#   db/schema.rb

1 files changed, 0 insertions, 5 deletions

diff --git a/config/webpack.config.js b/config/webpack.config.js
index 959cebe7487..19eeb497a14 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -43,15 +43,10 @@ function generateEntries() {
   autoEntriesCount = Object.keys(autoEntries).length;
 
   const manualEntries = {
-    monitoring:           './monitoring/monitoring_bundle.js',
-    mr_notes:             './mr_notes/index.js',
-    terminal:             './terminal/terminal_bundle.js',
-
     common:               './commons/index.js',
     common_vue:           './vue_shared/vue_resource_interceptor.js',
     locale:               './locale/index.js',
     main:                 './main.js',
-    ide:                  './ide/index.js',
     raven:                './raven/index.js',
     webpack_runtime:      './webpack.js',
   };