diff options
| author | Valeriy Sizov <vsv2711@gmail.com> | 2012-03-27 13:13:07 -0700 |
|---|---|---|
| committer | Valeriy Sizov <vsv2711@gmail.com> | 2012-03-27 13:13:07 -0700 |
| commit | 27cd6c758db00bf9eade4c7b5bf4c41ddd48ff85 (patch) | |
| tree | d7910d425fde321ed23f1289a0bc93978c36e6e2 /config | |
| parent | 341b6d546ba5396d72bb51d3d266a94c3cb49206 (diff) | |
| parent | 6e27350aac1ed5616352af343bac2f8eefc7a840 (diff) | |
| download | gitlab-ce-27cd6c758db00bf9eade4c7b5bf4c41ddd48ff85.tar.gz | |
Merge pull request #585 from patthoyts/pt/omniauth-config
Move OmniAuth configuration details into a non-revision controlled file.
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/devise.rb | 15 | ||||
| -rw-r--r-- | config/initializers/omniauth.rb.sample | 15 |
2 files changed, 18 insertions, 12 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index ae378b73140..5b066edd47d 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -195,18 +195,9 @@ Devise.setup do |config| config.sign_out_via = :delete # ==> 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 :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' + # To configure a new OmniAuth provider copy and edit omniauth.rb.sample + # selecting the provider you require. + # Check the wiki for more information on setting up on your models # ==> Warden configuration # If you want to use other strategies, that are not supported by Devise, or diff --git a/config/initializers/omniauth.rb.sample b/config/initializers/omniauth.rb.sample new file mode 100644 index 00000000000..8728472f076 --- /dev/null +++ b/config/initializers/omniauth.rb.sample @@ -0,0 +1,15 @@ +# Copy this file to 'omniauth.rb' and configure it as necessary. +# The wiki has further details on configuring each provider. + +Devise.setup do |config| + # 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' +end
\ No newline at end of file |