Merge branch 'master' into cross

config/environments/production.rb

@@ -30,7 +30,7 @@ Rails.application.configure do
   # config.assets.css_compressor = :sass
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.
-  config.assets.compile = false
+  config.assets.compile = true
 
   # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 

config/initializers/default_meta.rb

@@ -0,0 +1 @@
+DEFAULT_META = YAML.load_file(Rails.root.join("config/meta.yml"))

config/meta.yml

@@ -0,0 +1,5 @@
+meta_product_name: "Product Name"
+meta_title: "Polyglot - Live translation"
+meta_description: "Translate your call live"
+meta_image: "phone.jpg"                       # should exist in `app/assets/images/`
+twitter_account: "@EthanFraenkel"   # required for Twitter Cards

config/routes.rb

@@ -36,12 +36,11 @@ Rails.application.routes.draw do
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
   get '/home', to: 'pages#home'
 
-
   get '/users/:id', to: 'users#show', as: :user
   get '/users/:id/edit', to: 'users#edit', as: :user_edit
   patch '/users/:id', to: 'users#update'
   delete '/users/:id', to: 'users#destroy'
 
-  resources :connections, only: [:create, :new, :destroy]
-  #get '/add_contact', to: 'connections#create'
+  resources :connections, only: [:create, :destroy]
+  get '/add_contact', to: 'connections#new', as: :add_contact
 end