Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce
This commit is contained in:
commit
7c1c03888c
|
@ -75,7 +75,7 @@ module ApplicationHelper
|
|||
else
|
||||
gravatar_url = request.ssl? || gitlab_config.https ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url
|
||||
user_email.strip!
|
||||
sprintf gravatar_url, hash: Digest::MD5.hexdigest(user_email.downcase), size: size
|
||||
sprintf gravatar_url, hash: Digest::MD5.hexdigest(user_email.downcase), size: size, email: user_email
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
|
@ -21,6 +21,7 @@ Before configuring individual OmniAuth providers there are a few global settings
|
|||
```
|
||||
|
||||
2. Find the section dealing with OmniAuth. The section will look similar to the following.<br />
|
||||
|
||||
```
|
||||
## OmniAuth settings
|
||||
omniauth:
|
||||
|
@ -50,6 +51,7 @@ Before configuring individual OmniAuth providers there are a few global settings
|
|||
# app_secret: 'YOUR APP SECRET',
|
||||
# args: { scope: 'user:email' } }
|
||||
```
|
||||
|
||||
3. Change `enabled` to `true`.
|
||||
4. Consider the next two configuration options: `allow_single_sign_on` and `block_auto_created_users`.
|
||||
* `allow_single_sign_on` defaults to `false`. If `false` users must be created manually or they will not be able to
|
||||
|
|
Loading…
Reference in New Issue