Merge branch 'master' into 'ph-es-notes-module'ph-es-notes-module

# Conflicts:
#   app/assets/javascripts/main.js

1 files changed, 0 insertions, 2 deletions

diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index 63f2a65700c..15a3a91c5f5 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -45,12 +45,10 @@ import './layout_nav';
 import LazyLoader from './lazy_loader';
 import './line_highlighter';
 import initLogoAnimation from './logo';
-import './merge_request';
 import './milestone_select';
 import './preview_markdown';
 import './projects_dropdown';
 import './render_gfm';
-import './right_sidebar';
 import initBreadcrumbs from './breadcrumb';
 
 import './dispatcher';