diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-23 13:21:52 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-23 13:21:52 +0400 |
| commit | 7c1c03888ceb9313dc08886438c9a50eb7f7e4c0 (patch) | |
| tree | cf5bbc01694514c8298b79271fb66db5653db124 /config | |
| parent | 3bb8c17cc33fa1c3f7929c83ff114d0e0fbfb56b (diff) | |
| parent | 3295a4db9dc417f368720f7fe9724ec8bee0ddcd (diff) | |
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 1 | ||||
| -rw-r--r-- | config/initializers/devise.rb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 19805aaae42..f1477fc6b7b 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -122,6 +122,7 @@ production: &base ## Gravatar gravatar: enabled: true # Use user avatar image from Gravatar.com (default: true) + # gravatar urls: possible placeholders: %{hash} %{size} %{email} # plain_url: "http://..." # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm # ssl_url: "https://..." # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 50669ece7a8..d5cb110e881 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -223,6 +223,7 @@ Devise.setup do |config| method: Gitlab.config.ldap['method'], bind_dn: Gitlab.config.ldap['bind_dn'], password: Gitlab.config.ldap['password'], + filter: Gitlab.config.ldap['user_filter'], name_proc: email_stripping_proc end @@ -244,4 +245,4 @@ Devise.setup do |config| config.omniauth provider['name'].to_sym, *provider_arguments end -end +end
\ No newline at end of file |