# 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

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

Avoid re-fetching merge-base SHA from Gitaly unnecessarily

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

Add partial indexes on todos to handle users with many todos

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

Fix code and wiki search results when filename is non-ASCII

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

Adds guidelines regarding `:key` keyword

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

Updates file extensions on Vue docs

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

Use object ID to prevent duplicate keys Vue warning on Issue Boards page during development

Closes #44139

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

# 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

Previously, we only handled non-ASCII file contents, but the name itself can be
non-ASCII.

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

Closes #43702

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