Use the same jQuery in prod and dev, avoid minimizing twice

2017-03-22 15:48:03 -04:00 · 2017-03-22 15:48:03 -04:00 · f97a6598aa
parent 9f930125f5
commit f97a6598aa
4 changed files with 1 additions and 12 deletions
--- a/app/assets/javascripts/ember_jquery.js
+++ b/app/assets/javascripts/ember_jquery.js
@ -1,5 +1,5 @@
 //= require env
-//= require jquery_include
+//= require jquery
 //= require ember_include
 //= require discourse-loader
 //= require ember-shim
--- a/app/assets/javascripts/jquery_include.js.erb
+++ b/app/assets/javascripts/jquery_include.js.erb
@ -1,7 +0,0 @@
-<%
-if Rails.env.development? || Rails.env.test?
-  require_asset ("jquery.debug.js")
-else
-  require_asset ("jquery.prod.js")
-end
-%>
--- a/vendor/assets/javascripts/jquery.debug.js
+++ b/vendor/assets/javascripts/jquery.debug.js
--- a/vendor/assets/javascripts/jquery.prod.js
+++ b/vendor/assets/javascripts/jquery.prod.js