Jacob Vosmaer 90ce0be420 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups ...

Conflicts:
	app/models/group.rb
	app/views/groups/members.html.haml
	db/schema.rb

2014-08-29 14:43:20 +02:00

..

access.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups

2014-08-29 14:43:20 +02:00

adapter.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2014-07-10 23:43:42 +03:00

group.rb

Remove copyright licenses missed in 0fdab6a747.

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

person.rb

Create an Gitlab::LDAP::Person#ssh_keys attribute

2014-07-09 11:06:53 +02:00

user.rb

Strip apostrophe from email generated usernames.

2014-06-11 17:06:28 +02:00