Jacob Vosmaer e93523ed31 Merge commit '79190fe06b' into merge-79190fe06b-7.3.0-pre ...

Conflicts:
	Gemfile
	README.md
	VERSION
	db/schema.rb
	doc/install/installation.md
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/user.rb
	spec/lib/gitlab/ldap/access_spec.rb

2014-09-15 11:24:51 +02:00

..

access.rb

Less private methods, more test ordering

2014-09-03 11:28:32 +02:00

adapter.rb

Move LDAP tests to proper location

2014-09-03 10:10:55 +02:00

group.rb

Remove copyright licenses missed in 0fdab6a747.

2014-06-02 09:11:24 +02:00

person.rb

Add extra tests around OAUTH / LDAP find_or_create

2014-09-03 10:29:03 +02:00

user.rb

Patch oauth refactoring into EE

2014-09-11 11:53:52 +02:00