Merge branch 'rm-dir-prefix' of https://github.com/cirosantilli/gitlab-elearn into cirosantilli-rm-dir-prefix
Merge pull request #6360 from jvanbaarsen/fix-6328-expose-username

Also expose username for the /discover endpoint
Fixed error on mysql install link

Fixed error on install guide to mysql conf page.
Merge branch 'toggle_diff_comments' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-toggle_diff_comments

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/stylesheets/sections/commits.scss
	app/assets/stylesheets/sections/notes.scss
	app/views/projects/commits/_diffs.html.haml
	features/steps/project/merge_requests.rb
Correct BackgroundJobs page for both OSX and linux

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Update changelog

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'master' of github.com:gitlabhq/gitlabhq
TestEnv.reset_satellite_dir should run 'git clean' quietly

Removes the "Removing gitlabhq" messages cluttering spec output
Allow passing an adapter to Gitlab::LDAP::Person
Add Gitlab::LDAP::Adapter.open

This new method is based on Net::LDAP.open, which reuses a single LDAP
connection.
Add Gitlab::LDAP::Access.open

This new method wraps Gitlab::LDAP::Adapter.open to enable connection
reuse.
Open/close LDAP in ApplicationController

By opening the LDAP connection at the controller level we can reuse it
for all LDAP queries during the request.
Override rake spec and rake spinach tasks

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge pull request #6527 from tsigo/quieter-test-output

Quieter test output
Merge pull request #6526 from mavimo/patch-1

Fixed error on mysql install link
Override rake test

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq into dzaporozhets/gitlabhq-import-timeout

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	db/schema.rb
Fix project creation test

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fix specs

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>