7-4-stable to master.  With resolved conflicts

See merge request !1221

Conflicts:
	CHANGELOG
	VERSION

Merge File basename and direname into split

Update patch release document

See merge request !1218

cleanup monthly release details

Fix internal snippets

See merge request !1216

Fix import.rake failed import if project name is also an existing namespace.

also an existing namespace. E.g., when trying to import
group/root.git, that would fail if there is an user called root.

Bump gitlab_git to 7.0.0.rc10 (submodules fix)

See merge request !1215

Fix public snippets

See merge request !1214

Fix LDAP config lookup for provider 'ldap'

See merge request !1213

Faster because only does one split in that case.

Conflicts:
	CHANGELOG

Fix LDAP authentication for Git HTTP access

See merge request !1211

Apps on website

See merge request !1210

Remove unused variable user at lib/gitlab/markdown

Use argument list for sh instead of string

Fix Rspec error when using non-default port

Only run avatar chooser Js on pages that need it

Remove whitespace link between user group avatars

Fix doc raketasts import md style

Fix milestone link in issue page. Closes #174

For a complete description see #174.

See merge request !196