Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce

Dmitriy Zaporozhets
2 parents 3bb8c17c 3295a4db
Showing 4 changed files with 6 additions and 2 deletions Show diff stats
app/helpers/application_helper.rb
config/gitlab.yml.example
config/initializers/devise.rb
doc/integration/omniauth.md
@@ -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: &amp;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
 \ No newline at end of file
@@ -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
...	...	@@ -75,7 +75,7 @@ module ApplicationHelper
75	75	else
76	76	gravatar_url = request.ssl? \|\| gitlab_config.https ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url
77	77	user_email.strip!
78		- sprintf gravatar_url, hash: Digest::MD5.hexdigest(user_email.downcase), size: size
	78	+ sprintf gravatar_url, hash: Digest::MD5.hexdigest(user_email.downcase), size: size, email: user_email
79	79	end
80	80	end
81	81
...	...
...	...	@@ -122,6 +122,7 @@ production: &base
122	122	## Gravatar
123	123	gravatar:
124	124	enabled: true # Use user avatar image from Gravatar.com (default: true)
	125	+ # gravatar urls: possible placeholders: %{hash} %{size} %{email}
125	126	# plain_url: "http://..." # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm
126	127	# ssl_url: "https://..." # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm
127	128
...	...
...	...	@@ -223,6 +223,7 @@ Devise.setup do \|config\|
223	223	method: Gitlab.config.ldap['method'],
224	224	bind_dn: Gitlab.config.ldap['bind_dn'],
225	225	password: Gitlab.config.ldap['password'],
	226	+ filter: Gitlab.config.ldap['user_filter'],
226	227	name_proc: email_stripping_proc
227	228	end
228	229
...	...	@@ -244,4 +245,4 @@ Devise.setup do \|config\|
244	245
245	246	config.omniauth provider['name'].to_sym, *provider_arguments
246	247	end
247	248	-end
	249	+end
248	250	\ No newline at end of file
...	...
...	...	@@ -21,6 +21,7 @@ Before configuring individual OmniAuth providers there are a few global settings
21	21	```
22	22
23	23	2. Find the section dealing with OmniAuth. The section will look similar to the following.<br />
	24	+
24	25	```
25	26	## OmniAuth settings
26	27	omniauth:
...	...	@@ -50,6 +51,7 @@ Before configuring individual OmniAuth providers there are a few global settings
50	51	# app_secret: 'YOUR APP SECRET',
51	52	# args: { scope: 'user:email' } }
52	53	```
	54	+
53	55	3. Change `enabled` to `true`.
54	56	4. Consider the next two configuration options: `allow_single_sign_on` and `block_auto_created_users`.
55	57	* `allow_single_sign_on` defaults to `false`. If `false` users must be created manually or they will not be able to
...	...