Rename UserPreference controller methods to follow rails conventions more closely

[rails.git] / config / initializers / assets.rb

diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index f59f60820e7edce2072f1b097b35fa09dbba9512..255ae108e2a96b5eade11fcbb11d041dd608f5bf 100644 (file)
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -4,31 +4,17 @@
 Rails.application.config.assets.version = "1.0"
 
 # Location of manifest file.
 Rails.application.config.assets.version = "1.0"
 
 # Location of manifest file.

-Rails.application.config.assets.manifest = Rails.root.join("tmp/manifest.json")
+Rails.application.config.assets.manifest = Rails.root.join("tmp", "manifest.json")

 
 

-# Add additional assets to the asset load path
+# Add additional assets to the asset load path.

 Rails.application.config.assets.paths << Rails.root.join("config")
 
 Rails.application.config.assets.paths << Rails.root.join("config")
 

+# Add additional assets to the asset load path.
+# Rails.application.config.assets.paths << Emoji.images_path
+# Add Yarn node_modules folder to the asset load path.
+Rails.application.config.assets.paths << Rails.root.join("node_modules")
+

 # Precompile additional assets.
 # 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 login.js diary_entry.js )
-Rails.application.config.assets.precompile += %w( screen-ltr.css print-ltr.css )
-Rails.application.config.assets.precompile += %w( screen-rtl.css print-rtl.css )
-Rails.application.config.assets.precompile += %w( leaflet-all.css leaflet.ie.css )
-Rails.application.config.assets.precompile += %w( id.js id.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( swfobject.js expressInstall.swf )
-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/img/*.svg iD/img/*.png iD/img/*.gif )
-Rails.application.config.assets.precompile += %w( iD/img/pattern/*.png )
-Rails.application.config.assets.precompile += %w( iD/locales/*.json )
-Rails.application.config.assets.precompile += %w( iD/traffico/stylesheets/traffico.css )
-Rails.application.config.assets.precompile += %w( iD/traffico/fonts/traffico_* )
-Rails.application.config.assets.precompile += %w( iD/traffico/string-maps/*.json )
+# application.js, application.css, and all non-JS/CSS in the app/assets
+# folder are already added.
+# Rails.application.config.assets.precompile += %w( admin.js admin.css )