Commit 98a98f27ac4a41935d7828fd8d4efed769b48a09
1 parent
362bbc10
Exists in
master
and in
39 other branches
Disabling rails black magic (TurboLinks)
Showing
2 changed files
with
2 additions
and
12 deletions
Show diff stats
src/proxy/gitlab/templates/proxy/gitlab.html
| @@ -26,17 +26,6 @@ | @@ -26,17 +26,6 @@ | ||
| 26 | {% block head_js %} | 26 | {% block head_js %} |
| 27 | <script type="text/javascript"> | 27 | <script type="text/javascript"> |
| 28 | $(function(){ | 28 | $(function(){ |
| 29 | - // By Default Gitlab uses an event listener to stop propagation on any links | ||
| 30 | - // and use HTML5 pseudo navigation. That was causing all links in our | ||
| 31 | - // headers and footers to send the user to the right location but | ||
| 32 | - // applying Gitlab CSS everywhere. | ||
| 33 | - // The workaround below will run before the Gitlab event and will prevent | ||
| 34 | - // it to work. | ||
| 35 | - | ||
| 36 | - $('.navbar a, .footer').not('.dropdown-toggle, .browserid-login').on("click", | ||
| 37 | - function(evt) { evt.stopPropagation(); } | ||
| 38 | - ); | ||
| 39 | - | ||
| 40 | // Somehow when there's a merge request, all options just disapear | 29 | // Somehow when there's a merge request, all options just disapear |
| 41 | // so this fix makes it show up again | 30 | // so this fix makes it show up again |
| 42 | $('div.panel-body div.automerge_widget').removeClass('hide'); | 31 | $('div.panel-body div.automerge_widget').removeClass('hide'); |
src/templates/base.html
| @@ -41,7 +41,8 @@ | @@ -41,7 +41,8 @@ | ||
| 41 | {% endblock %} | 41 | {% endblock %} |
| 42 | </head> | 42 | </head> |
| 43 | 43 | ||
| 44 | - <body class="container"> | 44 | + <!-- data-no-turbolink will disable Rails TurboLinks for all pages under Colab --> |
| 45 | + <body class="container" data-no-turbolink> | ||
| 45 | {% browserid_info %} | 46 | {% browserid_info %} |
| 46 | 47 | ||
| 47 | 48 |