Dmitriy Zaporozhets 9b140b22fb Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-into-ee ...

Conflicts:
	Gemfile.lock
	app/helpers/tab_helper.rb
	config/routes.rb
	db/schema.rb

2015-02-04 18:19:22 -08:00

..

access_spec.rb

fix specs after merge CE -> EE

2014-12-08 13:11:33 +02:00

adapter_spec.rb

Merge tests to support Multiple LDAP groups

2014-10-13 17:33:44 +02:00

authentication_spec.rb

fix specs

2014-12-04 15:53:26 +02:00

config_spec.rb

Fix LDAP config lookup for provider 'ldap'

2014-10-24 12:53:32 +03:00

user_spec.rb

Improvements to LDAP::User model

2015-01-29 13:28:41 -08:00