fix high cpu usage issue that occured in Firefox

fixes issue related with #342 (Merge Request view causes 100% CPU in firefox)
Merge branch 'fix-high-cpu-in-ff' of https://gitlab.com/federkasten/gitlab-ce into federkasten/gitlab-ce-fix-high-cpu-in-ff

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
Merge branch 'federkasten/gitlab-ce-fix-high-cpu-in-ff'