Merge branch 'master' into navbar_collapse

config.ru

@@ -1,4 +1,5 @@
 # This file is used by Rack-based servers to start the application.
 
 require ::File.expand_path('../config/environment',  __FILE__)
+use Rack::Deflater
 run Osem::Application

config/application.rb

@@ -60,6 +60,9 @@ module Osem
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
 
+    # Set cache headers
+    config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=31536000' }
+
     config.active_job.queue_adapter = :delayed_job
   end
 end

config/environments/production.rb

@@ -25,6 +25,10 @@ Osem::Application.configure do
   # Generate digests for assets URLs
   config.assets.digest = true
 
+  config.assets.css_compressor = :sass
+  config.assets.js_compressor = :uglifier
+  config.assets.gzip = true
+
   # Defaults to nil and saved in location specified by config.assets.prefix
   # config.assets.manifest = YOUR_PATH