# Conflicts:
#	.gitlab-ci.yml
#	app/assets/javascripts/boards/components/board_new_issue.vue
#	app/assets/javascripts/boards/components/sidebar/remove_issue.js
#	app/assets/javascripts/boards/filtered_search_boards.js
#	app/assets/javascripts/boards/index.js
#	app/assets/javascripts/boards/mixins/sortable_default_options.js
#	app/assets/javascripts/boards/models/issue.js
#	app/controllers/groups/boards_controller.rb
#	app/models/board.rb
#	app/models/group.rb
#	app/models/project.rb
#	app/views/groups/labels/index.html.haml
#	app/views/shared/issuable/_search_bar.html.haml
#	config/routes/group.rb
#	config/routes/project.rb
#	config/sidekiq_queues.yml
#	db/schema.rb
#	doc/README.md
#	doc/api/group_boards.md
#	lib/api/group_boards.rb
#	lib/api/job_artifacts.rb
#	lib/api/merge_requests.rb
#	lib/gitlab/ci/trace.rb
#	spec/controllers/groups/boards_controller_spec.rb
#	spec/factories/boards.rb
#	spec/javascripts/api_spec.js
#	spec/lib/gitlab/ci/trace_spec.rb
#	spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb

[ci skip]

CE upstream - 2018-03-06 15:24 UTC

Closes gitaly#1056, gitaly#1059, and gitlab-com/gitlab-docs#154

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

Fixes and enhancements for Geo admin dashboard

Closes #4658, #4864, and #4493

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

Merge branch 'move-pipeline_default-update_head_pipeline_for_merge_request-queue-to-pipeline_processing-namespace' into 'master'

Move update_head_pipeline_for_merge_request queue to `pipeline_processing` namespace

Closes #43919

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

Set sha256 checksum when archiving traces

Closes #43940

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

CE Port: Add `js-` classes in LabelsSelect component

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

Add labels support to Epics

Closes #3727 and #4032

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

Cluster monitoring changes CE backport

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

Resolve "Repository mirroring should notify when failed"

Closes #1123

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

Port to EE "Add archive feature to trace"

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

Bring one group board to CE

Closes #38337

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

EE PORT Bring one group issue board to CE

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

Unify lib/api/merge_requests.rb with EE

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

Speedup CI jobs

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

Unify lib/api/merge_requests.rb between CE and EE

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