diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2012-01-21 20:36:14 +0200 |
|---|---|---|
| committer | vsizov <vsv2711@gmail.com> | 2012-01-28 13:11:21 +0300 |
| commit | c083df0570d6fa83e6e302feff67ab65db15fe04 (patch) | |
| tree | e9a7856a5a89c3c430589adf42cf492de790751c /config | |
| parent | b4cc04d7e17eeefe6d89bbb72661a43d7d9e3e2e (diff) | |
| download | gitlab-ce-c083df0570d6fa83e6e302feff67ab65db15fe04.tar.gz | |
LDAP BASE IMPLEMENRTATION
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/devise.rb | 9 | ||||
| -rw-r--r-- | config/routes.rb | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 68bf5a0ea39..ae378b73140 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -199,6 +199,15 @@ Devise.setup do |config| # up on your models and hooks. # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo' + #config.omniauth :ldap, + # :host => 'YOUR_LDAP_SERVER', + # :base => 'THE_BASE_WHERE_YOU_SEARCH_FOR_USERS', + # :uid => 'sAMAccountName', + # :port => 389, + # :method => :plain, + # :bind_dn => 'THE_FULL_DN_OF_THE_USER_YOU_WILL_BIND_WITH', + # :password => 'THE_PASSWORD_OF_THE_BIND_USER' + # ==> Warden configuration # If you want to use other strategies, that are not supported by Devise, or # change the failure app, you can configure them inside the config.warden block. diff --git a/config/routes.rb b/config/routes.rb index bb575356d94..d6951c0eb9e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -39,7 +39,7 @@ Gitlab::Application.routes.draw do resources :projects, :constraints => { :id => /[^\/]+/ }, :only => [:new, :create, :index] resources :keys - devise_for :users + devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" } resources :projects, :constraints => { :id => /[^\/]+/ }, :except => [:new, :create, :index], :path => "/" do member do |