From 6a198d47aa5052f596e0e5d55cf7e55cc6f886d1 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 25 May 2014 00:24:41 +0100 Subject: [PATCH 1/1] Make sure all environment can see asset precompilation rules --- config/environments/production.rb | 22 +--------------------- config/initializers/assets.rb | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 config/initializers/assets.rb diff --git a/config/environments/production.rb b/config/environments/production.rb index 9debf9666..2b1587a21 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -32,9 +32,6 @@ OpenStreetMap::Application.configure do # Generate digests for assets URLs. config.assets.digest = true - # Version of your assets, change this if you want to expire all your assets. - config.assets.version = '1.0' - # Specifies the header that your server uses for sending files. # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx @@ -67,24 +64,7 @@ OpenStreetMap::Application.configure do # Enable serving of images, stylesheets, and JavaScripts from an asset server. # config.action_controller.asset_host = "http://assets.example.com" - # Precompile additional assets. - # application.js, application.css, and all non-JS/CSS in app/assets folder are already added. - config.assets.precompile += %w( index.js browse.js welcome.js fixthemap.js ) - config.assets.precompile += %w( user.js diary_entry.js swfobject.js ) - config.assets.precompile += %w( large-ltr.css small-ltr.css print-ltr.css ) - config.assets.precompile += %w( large-rtl.css small-rtl.css print-rtl.css ) - config.assets.precompile += %w( leaflet-all.css leaflet.ie.css ) - config.assets.precompile += %w( embed.js embed.css ) - config.assets.precompile += %w( html5shiv.js ) - config.assets.precompile += %w( images/marker-*.png img/*-handle.png ) - config.assets.precompile += %w( potlatch2.swf ) - config.assets.precompile += %w( potlatch2/assets.zip ) - config.assets.precompile += %w( potlatch2/FontLibrary.swf ) - config.assets.precompile += %w( potlatch2/locales/*.swf ) - config.assets.precompile += %w( help/introduction.* ) - config.assets.precompile += %w( iD.js iD.css ) - config.assets.precompile += %w( iD/img/*.svg iD/img/*.png iD/img/*.gif ) - config.assets.precompile += %w( iD/img/pattern/*.png ) + # `config.assets.precompile` has moved to config/initializers/assets.rb # Ignore bad email addresses and do not raise email delivery errors. # Set this to true and configure the email server for immediate delivery to raise delivery errors. diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb new file mode 100644 index 000000000..fd6d1e4d2 --- /dev/null +++ b/config/initializers/assets.rb @@ -0,0 +1,23 @@ +# Be sure to restart your server when you modify this file. + +# Version of your assets, change this if you want to expire all your assets. +Rails.application.config.assets.version = '1.0' + +# Precompile additional assets. +# application.js, application.css, and all non-JS/CSS in app/assets folder are already added. +Rails.application.config.assets.precompile += %w( index.js browse.js welcome.js fixthemap.js ) +Rails.application.config.assets.precompile += %w( user.js diary_entry.js swfobject.js ) +Rails.application.config.assets.precompile += %w( large-ltr.css small-ltr.css print-ltr.css ) +Rails.application.config.assets.precompile += %w( large-rtl.css small-rtl.css print-rtl.css ) +Rails.application.config.assets.precompile += %w( leaflet-all.css leaflet.ie.css ) +Rails.application.config.assets.precompile += %w( embed.js embed.css ) +Rails.application.config.assets.precompile += %w( html5shiv.js ) +Rails.application.config.assets.precompile += %w( images/marker-*.png img/*-handle.png ) +Rails.application.config.assets.precompile += %w( potlatch2.swf ) +Rails.application.config.assets.precompile += %w( potlatch2/assets.zip ) +Rails.application.config.assets.precompile += %w( potlatch2/FontLibrary.swf ) +Rails.application.config.assets.precompile += %w( potlatch2/locales/*.swf ) +Rails.application.config.assets.precompile += %w( help/introduction.* ) +Rails.application.config.assets.precompile += %w( iD.js iD.css ) +Rails.application.config.assets.precompile += %w( iD/img/*.svg iD/img/*.png iD/img/*.gif ) +Rails.application.config.assets.precompile += %w( iD/img/pattern/*.png ) -- 2.39.5