# 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

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

Move AssigneeTitle vue component

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

Ensure mirror can transition out of the started state when last_update_started_at is nil

Closes #5008 and #5205

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

Don't disable Container Registry for CI/CD projects

Closes #5210

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

# Conflicts:
#	app/assets/javascripts/vue_merge_request_widget/dependencies.js
#	doc/ci/yaml/README.md
#	doc/user/permissions.md
#	lib/gitlab/verify/job_artifacts.rb

[ci skip]

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

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

We should respect the default state from the application config for
these setting.

Move project fork spinach tests to RSpec

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