Merge branch 'master' of https://github.com/andreassteph/fetsite

config/initializers/devise.rb

@@ -223,7 +223,7 @@ Devise.setup do |config|
   # ==> OmniAuth
   # Add a new OmniAuth provider. Check the wiki for more information on setting
   # up on your models and hooks.
-  # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
+  #config.omniauth :facebook, 'appid', 'secret'
 
   # ==> Warden configuration
   # If you want to use other strategies, that are not supported by Devise, or

config/initializers/omniauth.rb

@@ -0,0 +1 @@
+

config/routes.rb

@@ -1,6 +1,6 @@
  Fetsite::Application.routes.draw do
 
-   devise_for :users
+   devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" }
    resources :home, :only=>[:index]
    #get 'home',:controller=>home,:action=>:index,:as=>"home_index"
    scope '(:locale)/admin' do
@@ -39,10 +39,10 @@
      resources :galleries do
      resources :fotos
      end
-     resources :memberships, :except=>[:new, :show, :edit]
+
      resources :gremien
      resources :fetprofiles do
-     resources :memberships, :only=>[:new, :show, :edit]
+     resources :memberships
      end
      resources :lecturers
      resources :semesters