Include the ee/ directory in backtraces

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

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

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

# Conflicts:
#	app/assets/javascripts/boards/mixins/sortable_default_options.js
#	app/assets/javascripts/members.js
#	config/application.rb
#	ee/app/assets/images/illustrations/epics/roadmap.svg
#	ee/app/assets/images/illustrations/prometheus-graphs_empty.svg
#	ee/app/views/shared/empty_states/icons/_service_desk_callout.svg

[ci skip]

Resolve "Update zaproxy image in Auto DevOps template"

Closes #44096

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

Fix "Remove source branch" button in MR widget during MWPS state

Closes #42814 and #4281

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

CE upstream - 2018-03-09 18:26 UTC

Closes gitaly#1051

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

Require jQuery to be explicitly imported

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

Port of "Require jQuery to be explicitly imported" to EE

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

Update wording to specify create/manage project vs group labels in labels dropdown

Closes #43702

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

Closes #44096

Removes duplicated & non used code

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

We need to drain these queues before we can remove them completely.
Since the Log Cursor may be writing to these queues until it is
restarted, we can't guarantee that a Redis migration will properly
migrate everything.

Closes #5219

This is a workaround until we can ship git 2.16 with GitLab.

Closes #5214

Delete no longer required spec

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

Remove sync script for gitlab-svgs and reference the vendored library directly

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

Port "Remove sync script for gitlab-svgs" to EE

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