Merge a72fc1c02e into 021b118c5c

config/boot.rb

@@ -1,6 +1,4 @@
 require 'rubygems'
-require 'yaml'
-YAML::ENGINE.yamler = 'syck'
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 

config/environments/production.rb

@@ -1,4 +1,4 @@
-Osem::Application.configure do
+Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # Code is not reloaded between requests
@@ -16,8 +16,8 @@ Osem::Application.configure do
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
   config.serve_static_assets = false
-  # Compress JavaScripts and CSS
-  config.assets.compress = true
+  # Compress JavaScripts
+  config.assets.js_compressor = :uglifier
 
   # Don't fallback to assets pipeline if a precompiled asset is missed
   config.assets.compile = false