Fix lib/gitlab/usage_data.rb. spec/lib/gitlab/usage_data_spec.rb. spec/support/kubernetes_helpers.rb.

# Conflicts:
#	app/assets/javascripts/boards/stores/boards_store.js
#	app/assets/javascripts/dispatcher.js
#	app/assets/javascripts/milestone_select.js
#	app/assets/javascripts/repo/components/repo_file.vue
#	app/assets/javascripts/repo/components/repo_loading_file.vue
#	app/assets/stylesheets/framework/avatar.scss
#	app/assets/stylesheets/framework/modal.scss
#	app/assets/stylesheets/pages/note_form.scss
#	app/controllers/projects/issues_controller.rb
#	app/controllers/projects/refs_controller.rb
#	app/models/merge_request.rb
#	app/models/repository.rb
#	config/initializers/8_metrics.rb
#	config/routes/group.rb
#	db/schema.rb
#	doc/api/merge_requests.md
#	lib/gitlab/checks/change_access.rb
#	lib/gitlab/metrics/transaction.rb
#	lib/gitlab/path_regex.rb
#	lib/gitlab/usage_data.rb
#	spec/lib/gitlab/checks/change_access_spec.rb
#	spec/lib/gitlab/metrics/web_transaction_spec.rb
#	spec/lib/gitlab/usage_data_spec.rb
#	spec/models/merge_request_spec.rb
#	spec/requests/api/groups_spec.rb
#	spec/routing/group_routing_spec.rb
#	spec/support/kubernetes_helpers.rb

[ci skip]

Cleanup tests

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

When deleting merged branches, ignore protected tags

Closes #39732

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

CE Upstream - Monday

Closes gitlab-ce#39776, gitlab-ce#39771 et #3544

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

Free some reserved group routes

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

Make BackgroundTransaction#labels public

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

Make BackgroundTransaction#labels public

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

fix karma config file

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

Modals in UX guide

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

Adds typescript support in webpack. With Mike G.

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

Add API support and storage for GeoNode status in the database

Closes #3867 and #3740

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

Add note on registry restrictions on GitLab.com

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

Project with many branches can lock server running "git branch --contains XXX"

Closes #37824

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

Add Ingress to cluster applications section

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

Upgrade vendored templates for 10.2

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

Improve GitLab Import rake task to work with Hashed Storage and Subgroups

Closes #36509

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

Fix merge_request_spec

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