Merge branch 'deny-system-notes-edit' into 'master'

Don't allow edit of system notes

Fix #1412

See merge request !1052
Return extra empty line in blob render
Disable allow_username_or_email_login in example

The example LDAP configuration in gitlab.yml enables the
allow_username_or_email_login setting. Because the effect of this
setting is somewhat counterintuitive, I propose we make 'false' the
example default. The settings initializer already sets this setting to
'false'.
Remove LDAP::Access#find_user

This method existed to allow LDAP users to take over existing GitLab
accounts if the part before the '@' of their LDAP email attribute
matched the username of an existing GitLab user. I propose to disable
this behavior in order to prevent unintended GitLab account takeovers.

After this change it is still possible to take over an existing GitLab
account with your LDAP credentials, as long as the GitLab account email
address matches the LDAP user email address.
Add CHANGELOG entry for LDAP takeover deprecation
Rename ldap tests even further
Merge pull request #7519 from jvanbaarsen/enable-blame-highlighting

Enable highlighting for blame
Merge pull request #7517 from jvanbaarsen/guard-spring-fix

Updated the spring gem and fixed the guard file
Merge pull request #7634 from zzet/patch-11

Return extra empty line in blob render
Merge pull request #7221 from mcmillion/fix-issue-comment-rss-feed

Fix Atom feed for comments
Move and rename ldap / oauth specs
make CI build faster
Use svg instead of png to get better image quality
Merge pull request #7640 from PeterDaveHello/patch-2

Use svg instead of png to get better image quality
Comment typo.
Merge pull request #7641 from cirosantilli/patch-4

Comment typo.
Comment typo.
Adding in snippet search functionality

http://feedback.gitlab.com/forums/176466-general/suggestions/5529795-search-though-snippets
Merge pull request #7642 from cirosantilli/patch-5

Comment typo.
Fine-tune the Remove Project redirect. Now it redirects to admin_projects_path and shows a flash message confirming the action has been taken.