Merge branch 'rails4' of ssh://github.com/metamaps/metamaps_gen002 into rails4

Gemfile

@@ -36,6 +36,7 @@ end
 
 group :production do #this is used on heroku
  #gem 'rmagick'
+ gem 'rails_12factor'
 end
 
 group :development, :test do

Gemfile.lock

@@ -151,6 +151,11 @@ GEM
       loofah (~> 2.0)
     rails3-jquery-autocomplete (1.0.15)
       rails (>= 3.2)
+    rails_12factor (0.0.3)
+      rails_serve_static_assets
+      rails_stdout_logging
+    rails_serve_static_assets (0.0.4)
+    rails_stdout_logging (0.0.4)
     railties (4.2.4)
       actionpack (= 4.2.4)
       activesupport (= 4.2.4)
@@ -213,10 +218,8 @@ DEPENDENCIES
   quiet_assets
   rails (= 4.2.4)
   rails3-jquery-autocomplete
+  rails_12factor
   redis
   sass-rails
   uglifier
   uservoice-ruby
-
-BUNDLED WITH
-   1.10.6

config/boot.rb

@@ -1,4 +1,12 @@
 require 'rubygems'
+require 'rails/commands/server'
+module Rails
+  class Server
+    def default_options
+      super.merge(Host:  '0.0.0.0', Port: 3000)
+    end
+  end
+end
 
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)

config/environments/development.rb

@@ -1,6 +1,7 @@
 Metamaps::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
+  config.log_level = :info
   config.eager_load = false
 
   # In the development environment your application's code is reloaded on

config/environments/production.rb

@@ -1,6 +1,7 @@
 Metamaps::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
+  config.log_level = :warn
   config.eager_load = true
   config.assets.js_compressor = :uglifier
 
@@ -12,7 +13,9 @@ Metamaps::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 = true
+
+  config.assets.compile = true
 
   # Compress JavaScripts and CSS
   config.assets.compress = true