Conflicts:
	app/helpers/issuables_helper.rb

This was causing things to explode with having 2 versions of Vue on the page at the same. Webpack will save us once we get that merged in

Merge branch 'time-tracking-integration' of gitlab.com:gitlab-org/gitlab-ee into time-tracking-integration

Add Redis Sentinel HA docs (port from CE)

See merge request !884

[ci skip]

Merge branch 'time-tracking-integration' of gitlab.com:gitlab-org/gitlab-ee into time-tracking-integration

[ci skip]

[ci skip]

[ci skip]

[ci skip]

Conflicts:
	app/controllers/projects/issues_controller.rb
	app/models/concerns/time_trackable.rb
	db/schema.rb