Resolve "gitlab:geo:check should check connections to the Geo tracking DB"

Closes #4849

See merge request gitlab-org/gitlab-ee!4881

Respect the configured git path for imported gitlab-shell operations (EE)

See merge request gitlab-org/gitlab-ee!4936

Add silent flag to curl in public IP lookup

See merge request gitlab-org/gitlab-ee!4950

Resolve "Geo: Don't attempt to expire the cache after a failed clone"

Closes #5197

See merge request gitlab-org/gitlab-ee!4940

skeleton loading for diff comments

See merge request gitlab-org/gitlab-ee!4917

CE upstream - 2018-03-12 18:25 UTC

Closes #5204 and #5217

See merge request gitlab-org/gitlab-ee!4939

Reduce noise from Chatops output

Closes #5140

See merge request gitlab-org/gitlab-ee!4938

The various responses produced by Chatops no longer include Slack
buttons, instead returning the message as a link. This reduces the noise
caused by the (rather large) buttons. We also no longer send a response
if the build did not produce output as the default response could get
annoying very quickly.

Handle empty chat output better

See merge request gitlab-org/gitlab-ee!4933

# Conflicts:
#	lib/gitlab.rb

[ci skip]

Use Gitaly 0.89.0

See merge request gitlab-org/gitlab-ce!17696

Bump parser and unparser gems to remove warnings

See merge request gitlab-org/gitlab-ce!17673

Include the ee/ directory in backtraces

Closes gitlab-ee#5204

See merge request gitlab-org/gitlab-ce!17664

Include the ee/ directory in backtraces

See merge request gitlab-org/gitlab-ee!4930

Move NothingToMerge vue component

See merge request gitlab-org/gitlab-ce!17544

Fix removes source branch text being rendered in merged state

Closes #44163

See merge request gitlab-org/gitlab-ce!17687

CE upstream - 2018-03-12 12:25 UTC

Closes #4281 and gitlab-ce#4281

See merge request gitlab-org/gitlab-ee!4931

Fix broken files blacklist link

See merge request gitlab-org/gitlab-ee!4873

Fixed issue notes being duplicated

Closes #44099

See merge request gitlab-org/gitlab-ce!17671

If the output was empty we would end up running `''.split("\n")`,
producing an empty Array. Slicing an empty Array using a range such as
1..-1 would then produce a nil value, instead of an empty Array. This in
turn would cause a NoMethodError since "join" is not defined for
NilClass.

IDE: Load full Files structure through API

See merge request gitlab-org/gitlab-ee!4859

Add back deprecated Geo queues that were removed in 10.6

Closes #5219

See merge request gitlab-org/gitlab-ee!4928

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17640

Allow use of system git for git fetch if USE_SYSTEM_GIT_FOR_FETCH is defined

Closes #5214

See merge request gitlab-org/gitlab-ee!4929

Resolve "Hover style for sidebar dropdowns is wrong"

Closes #42579

See merge request gitlab-org/gitlab-ce!17519

Respect the protocol in `expose_url`

Closes gitlab-ee#5217

See merge request gitlab-org/gitlab-ce!17681

When https is configured in the URL, also use that, and do not set it
to http.

Closes gitlab-org/gitlab-ee#5217