Merge branch 'ldap_nickname' into 'master'

Remove omniauth-ldap nickname bug workaround

Merge branch 'ldap_nickname' into 'master'
Remove omniauth-ldap nickname bug workaround
Dmitriy Zaporozhets
2 parents 4af38885 2e6b5370
Showing 2 changed files with 2 additions and 5 deletions Show diff stats
CHANGELOG
lib/gitlab/ldap/user.rb
@@ -2,6 +2,7 @@ v 6.8.0
   - Ability to at mention users that are participating in issue and merge req. discussion
   - Enabled GZip Compression for assets in example Nginx, make sure that Nginx is compiled with --with-http_gzip_static_module flag (this is default in Ubuntu)
   - Make user search case-insensitive (Christopher Arnold)
+  - Remove omniauth-ldap nickname bug workaround
  
 v 6.7.2
   - Fix upgrader script
@@ -86,11 +86,7 @@ module Gitlab
         end
  
         def username
-          (auth.info.nickname || samaccountname).to_s.force_encoding("utf-8")
-        end
-
-        def samaccountname
-          (auth.extra[:raw_info][:samaccountname] || []).first
+          auth.info.nickname.to_s.force_encoding("utf-8")
         end
  
         def provider
...	...	@@ -2,6 +2,7 @@ v 6.8.0
2	2	- Ability to at mention users that are participating in issue and merge req. discussion
3	3	- Enabled GZip Compression for assets in example Nginx, make sure that Nginx is compiled with --with-http_gzip_static_module flag (this is default in Ubuntu)
4	4	- Make user search case-insensitive (Christopher Arnold)
	5	+ - Remove omniauth-ldap nickname bug workaround
5	6
6	7	v 6.7.2
7	8	- Fix upgrader script
...	...
...	...	@@ -86,11 +86,7 @@ module Gitlab
86	86	end
87	87
88	88	def username
89		- (auth.info.nickname \|\| samaccountname).to_s.force_encoding("utf-8")
90		- end
91		-
92		- def samaccountname
93		- (auth.extra[:raw_info][:samaccountname] \|\| []).first
	89	+ auth.info.nickname.to_s.force_encoding("utf-8")
94	90	end
95	91
96	92	def provider
...	...