# Conflicts:
#	app/finders/issuable_finder.rb
#	app/views/admin/application_settings/_form.html.haml
#	lib/gitlab/auth/ldap/adapter.rb
#	lib/gitlab/auth/o_auth/user.rb
#	spec/models/user_spec.rb

[ci skip]