summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/application.rb6
-rw-r--r--config/environments/production.rb7
2 files changed, 5 insertions, 8 deletions
diff --git a/config/application.rb b/config/application.rb
index 881bd15..bb9d987 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -24,11 +24,5 @@ module Parley
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
# config.i18n.default_locale = :de
-
- # Enable the asset pipeline
- config.assets.enabled = true
-
- # Disabled for heroku
- config.assets.initialize_on_precompile = false
end
end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 3fa1b86..4d43431 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -20,14 +20,17 @@ Parley::Application.configure do
# config.action_dispatch.rack_cache = true
# Disable Rails's static asset server (Apache or nginx will already do this).
- config.serve_static_assets = false
+ config.serve_static_assets = true
+
+ # Enable the asset pipeline
+ config.assets.enabled = true
# Compress JavaScripts and CSS.
config.assets.js_compressor = :uglifier
# config.assets.css_compressor = :sass
# Do not fallback to assets pipeline if a precompiled asset is missed.
- config.assets.compile = false
+ config.assets.compile = true
# Generate digests for assets URLs.
config.assets.digest = true