[ci skip]

[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

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

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

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

Closes #346

Retry bundler and apt-get



See merge request !3146

Fixed the GitPushService specs

See merge request !3139

Add Elasticsearch status to Admin dashboard



See merge request !241

Add a `gemojione:sprite` Rake task

This task will generate a standard and Retina sprite of all of the
current Gemojione Emojis, with the accompanying SCSS map.

It will not appear in `rake -T` output, and the dependent gems are not
included in the Gemfile by default, because this task will only be
needed occasionally.

See merge request !3130

Fix error 500 in Todos

Closes #14095 

Closes #14075 

Closes #14109

Closes #14151

See merge request !3141