From c7ea29f2e313006df1c9b795353c4d0278b3445b Mon Sep 17 00:00:00 2001 From: Jacob Cody Wimer Date: Wed, 11 Feb 2015 11:11:29 -0500 Subject: [PATCH] Re-arranging requires in application.js --- app/assets/javascripts/application.js | 3 ++- config/application.rb | 2 +- config/environments/production.rb | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 385d870..01e343e 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,6 +12,7 @@ // //= require jquery //= require jquery_ujs +//= require dataTables/jquery.dataTables //= require_tree . //= require bootstrap -//= require dataTables/jquery.dataTables + diff --git a/config/application.rb b/config/application.rb index d9fd160..ec0739c 100644 --- a/config/application.rb +++ b/config/application.rb @@ -21,7 +21,7 @@ module Wrestling # config.i18n.default_locale = :de #Add Bootstrap SAAS to asset pipeline - config.assets.precompile = false + config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif) config.active_job.queue_adapter = :delayed_job end diff --git a/config/environments/production.rb b/config/environments/production.rb index bff2d1f..58df622 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -80,10 +80,10 @@ Wrestling::Application.configure do #THESE ADDED BY ME TO GET RAILS 4 WORKING IN HEROKU - # config.cache_classes = true - # config.serve_static_assets = true - # config.assets.compile = true - # config.assets.digest = true + config.cache_classes = true + config.serve_static_assets = true + config.assets.compile = true + config.assets.digest = true #Added by me to force SSL in production config.force_ssl = true