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

Conflicts:
	Gemfile.lock
	app/controllers/uploads_controller.rb
	app/models/application_setting.rb
	app/models/project_services/issue_tracker_service.rb
	app/views/projects/services/_form.html.haml
	db/schema.rb
	doc/integration/README.md
	features/steps/groups.rb

2015-03-11 18:41:41 -07:00

..

access.rb

Be sure that admin_group exists before trying to check for user membership.

2015-03-03 18:41:57 -08:00

adapter.rb

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

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

authentication.rb

Escape wildcards when searching LDAP by username.

2015-03-06 13:39:57 +01:00

config.rb

Prevent 500 error on ldap group links page

2014-12-08 15:58:01 +02:00

group.rb

Escape wildcards when searching LDAP by group name.

2015-03-06 13:40:45 +01:00

person.rb

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

2015-03-11 18:41:41 -07:00

user.rb

Improvements to LDAP::User model

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