fixing conflicts [#8]

2015-07-18 15:02:46 +02:00
parent d6cbac934e
commit c55021e18b
11 changed files with 172 additions and 2 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,6 @@
 Rails.application.routes.draw do
-  devise_for :users
+  devise_for :users, :controllers => { registrations: 'registrations' }
+  
  # The priority is based upon order of creation: first created -> highest priority.
  # See how all your routes lay out with "rake routes".