Merge branch 'master' of http://git.mostre.me/rafapolo/ambienteja

config/environments/development.rb

@@ -26,6 +26,8 @@ Rails.application.configure do
 
     config.cache_store = :null_store
   end
+  
+  config.serve_static_assets = true
 
   # Store uploaded files on the local file system (see config/storage.yml for options)
   config.active_storage.service = :local

config/initializers/assets.rb

@@ -7,6 +7,7 @@ Rails.application.config.assets.version = '1.0'
 # 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')
+Rails.application.config.assets.paths << Rails.root.join('public/images')
 Rails.application.config.assets.precompile += %w(application.js application.css)
 Rails.application.config.public_file_server.enabled = true
 # Precompile additional assets.