Jacob Vosmaer 4272926f55 Fix merge conflict in lib/gitlab/ldap/adapter.rb

2014-10-24 13:58:28 +02:00

..

access.rb

Properly fetch ldap groups

2014-10-15 14:52:07 +02:00

adapter.rb

Fix merge conflict in lib/gitlab/ldap/adapter.rb

2014-10-24 13:58:28 +02:00

authentication.rb

Fix LDAP authentication for Git HTTP access

2014-10-23 17:53:19 +03:00

config.rb

Merge branch '7-4-stable-ee' into ce_stable

2014-10-24 13:37:25 +03:00

group.rb

Merge branch 'feature-multi-ldap-servers-merge-master' into feature-multi-ldap-servers-group-sync

2014-10-15 14:50:24 +02:00

person.rb

Fix merge conflicts

2014-10-14 23:41:07 +02:00

user.rb

Fix authorization for LDAP login

2014-10-14 09:40:35 +02:00