Merge remote-tracking branch 'origin/master' into feature/fixed-email-address

Conflicts:
	users/app/views/emails/_email.html.haml

1 files changed, 7 insertions, 3 deletions

diff --git a/users/config/routes.rb b/users/config/routes.rb
index 8985502..0c2d8d9 100644
--- a/users/config/routes.rb
+++ b/users/config/routes.rb
@@ -1,8 +1,12 @@
 Rails.application.routes.draw do
 
-  scope "/1", :module => "V1", defaults: {format: 'json'} do
-    resources :sessions, :only => [:new, :create, :update, :destroy]
-    resources :users, :only => [:create]
+  constraints :subdomain => "api" do
+    namespace "api", { module: "V1",
+        path: "/1/",
+        defaults: {format: 'json'} } do
+      resources :sessions, :only => [:new, :create, :update, :destroy]
+      resources :users, :only => [:create]
+    end
   end
 
   get "login" => "sessions#new", :as => "login"