From ea37f4856ea7af2c5f888b3bea3a5487589d49a9 Mon Sep 17 00:00:00 2001
From: Jacques Erasmus <jerasmus@gitlab.com>
Date: Fri, 23 Oct 2020 12:40:08 +0000
Subject: Revert "Merge branch 'csp-headers' into 'master'"

This reverts merge request !1217
---
 layouts/default.html | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'layouts/default.html')

diff --git a/layouts/default.html b/layouts/default.html
index 9fd650f4..4ec6f3ca 100644
--- a/layouts/default.html
+++ b/layouts/default.html
@@ -70,12 +70,19 @@
   <script src="https://cdn.jsdelivr.net/npm/jquery@3.5.1/dist/jquery.min.js" integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0=" crossorigin="anonymous"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.16.1/umd/popper.min.js" integrity="sha512-ubuT8Z88WxezgSqf3RLuNi5lmjstiJcyezx34yIU2gAHonIi27Na7atqzUZCOoY4CExaoFumzOsFQ2Ch+I/HCw==" crossorigin="anonymous"></script>
   <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" integrity="sha384-B4gt1jrGC7Jh4AgTPSdUtOBvfO8shuf57BaghqFfPlYxofvL8/KUEfYiJOMMV+rV" crossorigin="anonymous"></script>
-  <script src="<%= @items['/assets/javascripts/toggle_popover.*'].path %>"></script>
+  <script>
+    $(function () {
+      $('[data-toggle="popover"]').popover();
+      $('.popover-dismiss').popover({
+        trigger: 'focus'
+      })
+    })
+  </script>
   <script src="https://cdn.jsdelivr.net/npm/clipboard@2/dist/clipboard.min.js"></script>
   <script type="application/javascript" src="<%= @items['/assets/javascripts/clipboardjs.*'].path %>"></script>
   <script type="application/javascript" src="<%= @items['/assets/javascripts/badges.*'].path %>"></script>
   <%= render '/docsearch.*' %>
-  <script src="<%= @items['/assets/javascripts/mermaid.*'].path %>"></script>
+  <%= render '/mermaid.*' %>
   <% if is_production? %>
   <%# Add analytics only in production %>
     <%= render '/analytics.*' %>
-- 
cgit v1.2.3