Merge branch 'master' into feature/limit_user_leak

Conflicts:
	users/lib/warden/strategies/secure_remote_password.rb

1 files changed, 5 insertions, 4 deletions

diff --git a/users/config/routes.rb b/users/config/routes.rb
index 2cd1740..c50cb15 100644
--- a/users/config/routes.rb
+++ b/users/config/routes.rb
@@ -1,17 +1,18 @@
 Rails.application.routes.draw do
 
   constraints :subdomain => "api" do
-    namespace "api", { module: "V1",
+    namespace "api", { module: "v1",
         path: "/1/",
         defaults: {format: 'json'} } do
-      resources :sessions, :only => [:new, :create, :update, :destroy]
+      resources :sessions, :only => [:new, :create, :update]
+      delete "logout" => "sessions#destroy", :as => "logout"
       resources :users, :only => [:create, :update]
     end
   end
 
   get "login" => "sessions#new", :as => "login"
-  get "logout" => "sessions#destroy", :as => "logout"
-  resources :sessions, :only => [:new, :create, :update, :destroy]
+  delete "logout" => "sessions#destroy", :as => "logout"
+  resources :sessions, :only => [:new, :create, :update]
 
   get "signup" => "users#new", :as => "signup"
   resources :users do