Upgraded to Rails 4

config/routes.rb

@@ -1,51 +1,52 @@
- Fetsite::Application.routes.draw do
-   resources :comments, except: [:show] do
-     collection do
-       get 'hide'
-     end
-   end
-
-       resources :comments, contstraints: {id: /[0-9]+/}, only: :show
+Fetsite::Application.routes.draw do
+  resources :comments, except: [:show] do
+    collection do
+      get 'hide'
+    end
+  end
+  resources :comments, contstraints: {id: /[0-9]+/}, only: :show
 
 
 ## Inserted for testing tests
-      resources :members , controller: :fetprofiles , as: :fetprofiles do
-        collection do
-          get 'verwalten'
-          get 'internlist'
-        end
-      end
-     resources :gremien do 
-        collection do 
-          get 'verwalten'
-        end
-      end
+  resources :members , controller: :fetprofiles , as: :fetprofiles do
+    collection do
+      get 'verwalten'
+      get 'internlist'
+    end
+  end
+  resources :gremien do 
+    collection do 
+      get 'verwalten'
+    end
+  end
 #
     # #-------------------------
 
-   namespace :survey do
-     resources :questions do
-       member do
-         get :answer
+  namespace :survey do
+    resources :questions do
+      member do
+        get :answer
         put :answer
-         get 'flag'
-         get :create_from_template
-       end
-     end
-     resources :choices
-
-   end
-   
-  themes_for_rails
-  devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" }
-  resources :home, :only=>[:index] do
-end
-resources :emails, :only=>[:index] do
-     collection do
- get :daily_reminder
+        get 'flag'
+        get :create_from_template
+      end
     end
-end
+    resources :choices
+    
+  end
+   
+  #themes_for_rails
+  
+  resources :home, :only=>[:index] do
+  end
+  resources :emails, :only=>[:index] do
+    collection do
+      get :daily_reminder
+    end
+  end
   get ':locale', constraints: {locale: /en|de/}, action: :language,controller: :home, as: "language"
+  
+  devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" }
   scope '(:locale)/admin' do
     resources :users, :only=>[]  do 
       collection do
@@ -71,7 +72,7 @@ end
       end
     end
   end
-  devise_for :users , :controllers=>{:omniauth_callbacks=> "users/omniauth_callbacks"}
+#  devise_for :users , :controllers=>{:omniauth_callbacks=> "users/omniauth_callbacks"}
   #match '/auth/:provider/callback', to: "session#new", via: [:get, :post]