Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/4378

Conflicts:
	app/assets/javascripts/dispatcher.js