Merge branch 'master' into sidebar-fly-out-sub-nav

1 files changed, 12 insertions, 0 deletions

diff --git a/app/assets/javascripts/how_to_merge.js b/app/assets/javascripts/how_to_merge.js
new file mode 100644
index 00000000000..19f4a946f73
--- /dev/null
+++ b/app/assets/javascripts/how_to_merge.js
@@ -0,0 +1,12 @@
+document.addEventListener('DOMContentLoaded', () => {
+  const modal = $('#modal_merge_info').modal({
+    modal: true,
+    show: false,
+  });
+  $('.how_to_merge_link').on('click', () => {
+    modal.show();
+  });
+  $('.modal-header .close').on('click', () => {
+    modal.hide();
+  });
+});