Merge branch 'testme_url' into 'master'

Fetch the testme repository from gitlab.com

See merge request !1078
Link to the canonical repos.
Merge branch 'use-canonical-repos' into 'master'

Use canonical repos

/cc @dzaporozhets

See merge request !1079
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Revert "Delete mailer queue"
Merge pull request #7724 from gitlabhq/revert-7252-master

Revert "Delete mailer queue"
Merge branch 'update_omniauth_ldap' into 'master'

Update omniauth-ldap and net-ldap

See merge request !1077
Wrap should always be enabled for parallel diff.
Serialize services properties
Update gitlab-grit to 2.6.11

From the gitlab-grit changelog:
  * Suppress 'unkown header' warnings
  * Add process.out to CommandFailed error
Wrap text that overflows the description field.
Merge branch 'gitlab-grit-2.6.11' into 'master'

Update gitlab-grit to 2.6.11

See merge request !1081
Merge branch 'wrap_by_default_for_parallel' into 'master'

Wrap by default for parallel

Fixes #1566

See merge request !1080
Merge pull request #7725 from matusb/feature/shibboleth-support

shibboleth authentication support
Merge branch 'word_wrap_in_description' into 'master'

Word wrap in description

Fixes #1560

See merge request !1082
Merge pull request #7705 from dblessing/serialize_service_properties

Serialize service properties
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Typo localy -> locally.
Merge pull request #7726 from cirosantilli/typo-locally

Typo localy -> locally.
cleanup MySQL doc wording