working ember... again

config/environments/test.rb

@@ -14,6 +14,8 @@ Qwaiter::Application.configure do
   # Log error messages when you accidentally call methods on nil
   config.whiny_nils = true
 
+  config.ember.variant = :development
+
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false

config/initializers/devise.rb

@@ -226,12 +226,19 @@ Devise.setup do |config|
   # config.navigational_formats = ['*/*', :html]
 
   # The default HTTP method used to sign out a resource. Default is :delete.
-  config.sign_out_via = :delete
+  config.sign_out_via = [:delete, :get]
 
   # ==> OmniAuth
   # Add a new OmniAuth provider. Check the wiki for more information on setting
   # up on your models and hooks.
   # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
+  if Rails.env.production?
+    config.omniauth :facebook, "505160086210072", "fcc474a3fb13c6bcc0f7c83a92ad1b17",
+      scope: 'email,user_birthday,publish_stream'
+  else
+    config.omniauth :facebook, "168928633304849", "22bc53e1a390c1e62d004195c55fe336",
+      scope: 'email,user_birthday,publish_stream'
+  end
 
   # ==> Warden configuration
   # If you want to use other strategies, that are not supported by Devise, or

config/routes.rb

@@ -1,5 +1,5 @@
 Qwaiter::Application.routes.draw do
-  devise_for :users
+  devise_for :users, controllers: { omniauth_callbacks: "users/omniauth_callbacks" }
   devise_for :suppliers
   devise_for :administrators
   namespace :admin do
@@ -107,7 +107,7 @@ Qwaiter::Application.routes.draw do
   get '/select_qrcode' => 'dashboard#select_qrcode'
   get '/table_qr_image' => 'dashboard#table_qr_image', as: :table_qr_image
 
-  mount Cmtool::Engine => '/cmtool'
+  #mount Cmtool::Engine => '/cmtool'
   #match "/:action", controller: 'dashboard'
 
   # The priority is based upon order of creation: