Escape wildcards in username. Addresses https://dev.gitlab.org/gitlab/gitlabhq/issues/2086. Also see https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/344 and https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1644. See merge request !2
net-ldap version update There is a bug in net-ldap < 0.5.0 preventing connections to Microsoft servers. Pushing the net-ldap dependency version should fix it. See the following net-ldap issue for a description. ruby-ldap/ruby-net-ldap#80 See merge request !2
…agecorp-master Conflicts: README.md spec/omniauth/strategies/ldap_spec.rb
…into syndicut-map-userinfo-fix Conflicts: spec/omniauth/strategies/ldap_spec.rb
Newer LDAP servers fail with older versions of net-ldap. Update to the fixed version. Signed-off-by: David Aguilar <email@example.com>
The Gemfile.lock shouldn't be included in a gem-based repository because it may artificially lock obsolete gems. An example of this is rb-fsevent which at the version it was locked at is incompatable with OS X 10.8 If something does need the version locked, specify it in the .gemspec or Gemfile itself.