CE-to-EE merge

See merge request !256

Change all instances of "web hooks" to "webhooks"

See merge request !3169

[ci skip]

[ci skip]

OCD hooooooooo!

[ci skip]

Fixes broken layout of web editor page on mobile

Fixes #13987 

<p><img src="https://gitlab.com/gitlab-org/gitlab-ce/uploads/3a58e7b576c25d5929bc1cdcbe163161/Screen_Shot_2016-03-10_at_1.13.19_PM.png" alt="Screen_Shot_2016-03-10_at_1.13.19_PM" width="487"></p>

See merge request !3167

Adds mention of Redcarpet as Markdown parser in docs

It makes it easier for users to find the source of issues related to
Markdown parsing.

[ci skip]

See merge request !3168

[ES] Minor fix



See merge request !255

Geo: Avoid locking yourself out when adding a GeoNode

This is a fix to https://gitlab.com/gitlab-org/gitlab-ee/issues/374 for Geo (#76).

It was possible to lock yourself out on the primary node, as in this example:

1. My GitLab domain is example.com
2. I go to the Geo nodes admin area for the first time (no node yet registered)
3. I register a new node http://example.com but I forget to mark it as primary
4. The GitLab server is now read-only and I cannot undo my action because of that
5. Users start e-mailing me death threats because they cannot use GitLab

This should be in 8.5 too.
cc @DouweM 

See merge request !252

Moves build status tooltip on issues

See merge request !3156

rewrite logo to simplify SVG code

_Originally opened at !3129 by @slang._

- - -

The look of the logo is obviously unchanged... This just gets rid of some useless SVG groups that Sketch made.

See merge request !3164

Use an exclusive lease for LDAP checks

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14134

Merge https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3140 first.

Only perform LDAP checks for a user after acquiring a lease. Checks
during user login do not require a lease.

The lease has a fixed expire time of 10 minutes.

See merge request !3143

Set position to auto left so that if it is off-screen it goes to the right

Geo: Improve GeoNodes Admin screen

Improves GeoNode admin screen for GitLab Geo (#76)

Old:
![image](/uploads/16b35ff867232c5f27a8bda878a46831/image.png)


New:

![image](/uploads/96e3ee2daf1eaef8618fd127cb155a16/image.png)

Solves https://gitlab.com/gitlab-org/gitlab-ee/issues/373

See merge request !251

Allow filtered explore results to be paged. Fixes #14104



See merge request !3149

Parse config/resque.yml in one place only



See merge request !3140

Set color text to blue for links inside gray areas

Closes #14011 

![](/uploads/4bce32cf7be4414f947a97cf266f7b0d/Screen_Shot_2016-03-09_at_6.53.12_PM.png)

See merge request !3147

CE upstream

@iamphill Please resolve ASAP `app/views/profiles/keys/_key.html.haml`

See merge request !245

Added missing tooltips to navigation



See merge request !254

Dropdown JS



See merge request !3112

Fixed spacing below ldap group sync submit button

Closes #346 

![Screen_Shot_2016-03-10_at_09.33.56](/uploads/d3f8ff476f48d248decb7c102a470caa/Screen_Shot_2016-03-10_at_09.33.56.png)ront


See merge request !253

Fixed flicker of download project button

Closes #14177

![download-button-flicker](/uploads/21e8ccc68ed66394c8ec65ca549f94ad/download-button-flicker.gif)

See merge request !3152