diff options
| author | Jacques Erasmus <jerasmus@gitlab.com> | 2020-10-23 11:39:22 +0300 |
|---|---|---|
| committer | Jacques Erasmus <jerasmus@gitlab.com> | 2020-10-23 11:39:22 +0300 |
| commit | fdd1fc948cd47c6b130e78e00b6b9e8f4e1b39eb (patch) | |
| tree | ca1eab05519e5539429492c65f9d9d11a401ee55 /layouts/default.html | |
| parent | 8ef6a7cd62318cc50f091133428f04ccaaa23df8 (diff) | |
| parent | f494d1179980f1c116929f7e1c7196a99b4fcc9e (diff) | |
Merge branch 'csp-headers' into 'master'
Add CSP meta tag
Closes #850
See merge request gitlab-org/gitlab-docs!1217
Diffstat (limited to 'layouts/default.html')
| -rw-r--r-- | layouts/default.html | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/layouts/default.html b/layouts/default.html index 4ec6f3ca..9fd650f4 100644 --- a/layouts/default.html +++ b/layouts/default.html @@ -70,19 +70,12 @@ <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> - $(function () { - $('[data-toggle="popover"]').popover(); - $('.popover-dismiss').popover({ - trigger: 'focus' - }) - }) - </script> + <script src="<%= @items['/assets/javascripts/toggle_popover.*'].path %>"></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.*' %> - <%= render '/mermaid.*' %> + <script src="<%= @items['/assets/javascripts/mermaid.*'].path %>"></script> <% if is_production? %> <%# Add analytics only in production %> <%= render '/analytics.*' %> |