serve_static_assets was renamed to serve_static_files

config/environments/production.rb

@@ -15,7 +15,7 @@ Diaspora::Application.configure do
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier

config/environments/test.rb

@@ -13,7 +13,7 @@ Diaspora::Application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
+  config.serve_static_files = true
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching

config/initializers/assets.rb

@@ -3,6 +3,6 @@
 #   the COPYRIGHT file.
 
 Diaspora::Application.configure do
-  config.serve_static_assets = AppConfig.environment.assets.serve?
+  config.serve_static_files = AppConfig.environment.assets.serve?
   # config.static_cache_control = "public, max-age=3600" if AppConfig[:serve_static_assets].to_s == 'true'
 end