diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 5c7fb6d55..c095192b4 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -1,6 +1,4 @@ //= require hammer.min.js -//= require jquery-2.2.4.js -//= require jquery-migrate-1.4.1.js //= require jquery-ui-1.11.2.min.js //= require jquery.hotkeys.js //= require jquery.timeout.js diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb index 76e92a703..d0f854bbe 100644 --- a/app/views/layouts/default.html.erb +++ b/app/views/layouts/default.html.erb @@ -31,6 +31,14 @@ <% if CurrentUser.user.custom_style.present? %> <%= stylesheet_link_tag custom_style_users_path, :media => "screen" %> <% end %> + + <%= javascript_include_tag "application" %> <%= raw Danbooru.config.custom_html_header_content %> <%= yield :html_header %>