# Conflicts:
#	app/assets/javascripts/boards/models/list.js
#	app/assets/javascripts/main.js
#	app/assets/stylesheets/pages/groups.scss
#	app/models/concerns/issuable.rb
#	app/models/prometheus_metric.rb
#	app/models/resource_label_event.rb
#	app/presenters/commit_status_presenter.rb
#	app/views/projects/project_members/index.html.haml
#	config/prometheus/common_metrics.yml
#	db/schema.rb
#	doc/api/resource_label_events.md
#	doc/development/prometheus_metrics.md
#	lib/api/entities.rb
#	lib/api/resource_label_events.rb
#	lib/gitlab/ci/status/build/failed.rb
#	lib/gitlab/import_export/import_export.yml
#	locale/gitlab.pot
#	spec/features/projects/members/invite_group_and_members_spec.rb
#	spec/features/projects/members/invite_group_spec.rb
#	spec/features/projects/members/share_with_group_spec.rb
#	spec/features/usage_stats_consent_spec.rb
#	spec/lib/gitlab/import_export/all_models.yml
#	spec/lib/gitlab/import_export/safe_model_attributes.yml
#	spec/requests/api/resource_label_events_spec.rb
#	yarn.lock

[ci skip]

Fixes conflicts for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21545

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

CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7256

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

[EE] Ask user explicitly about usage stats agreement

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

Write diff highlighting cache upon MR creation (refactors caching)

Closes #50204

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

Remove orphaned label links and add a foreign key constraint

Closes gitlab-ee#7482

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

Include private contributions in user contribution graph

Closes #14078

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

[EE] Resolve "Remove old storage logic from Import/Export"

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

CE upstream - 2018-09-07 00:21 UTC

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

On GitLab.com, there are over 2 million orphaned label links out of
a total of 13 million. These orphaned label links can cause
quiet failures, such as unexpected nil values in ExportCsvWorker.

Closes gitlab-org/gitlab-ee#7482

Ask user explicitly about usage stats agreement

Closes #48962

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

Resolve "Remove old storage logic from Import/Export"

Closes #51144, #50109, #48778, and #51079

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

Resolve "Wiki page attachments not rendered properly"

Closes #51196

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

Replace whitespaces in wiki page attachments file names

Closes #51194

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