routes.rb in artfully_ose-1.2.0.pre.5

- old
+ new

@@ -32,11 +32,11 @@
     resources :shows, :only => :show
     resource :checkout, :only => :create
   end
 
   devise_for :members
-  devise_for :users
+  devise_for :users, :controllers => {:sessions => "users/sessions"}
   devise_scope :user do
     get "sign_up", :to => "devise/registrations#new"
   end
 
   namespace :members do
@@ -83,10 +83,12 @@
         get :data
       end
     end
   end
 
+  resources :memberships, :only => :index
+
   def people_actions
     resources :actions
     resources :memberships do
       collection do
         post :bulk_update
@@ -173,10 +175,10 @@
     resources :tickets, shallow: true, :only => [ :new, :create ] do
       member do
         put :validated
         put :unvalidated
       end
-      
+
       collection do
         delete :delete
         put :on_sale
         put :off_sale
         put :bulk_edit