Jan-Willem van der Meer 471054e1f5 Merge branch 'ce-upstream' into feature-multi-ldap-servers-merge-master ...

Conflicts:
	app/controllers/sessions_controller.rb
	app/models/user.rb
	app/views/devise/sessions/new.html.haml
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	config/initializers/7_omniauth.rb
	config/initializers/devise.rb
	lib/api/ldap.rb
	lib/gitlab/ldap/authentication.rb
	lib/gitlab/ldap/config.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/ldap/user.rb

2014-10-15 08:19:13 +02:00

..

assets

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

controllers

Add ldap callback definitions to initializer

2014-10-14 17:26:42 +02:00

finders

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

helpers

Merge branch 'ce-upstream' into feature-multi-ldap-servers-merge-master

2014-10-15 08:19:13 +02:00

mailers

Merge remote-tracking branch 'origin/master' into ee-7-4

2014-10-02 13:24:59 +03:00

models

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

services

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

uploaders

Make existing tests test something, return correct errors.

2014-05-26 14:17:46 +02:00

views

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

workers

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ee-7-4

2014-10-03 16:18:40 +03:00