add file size limit to diff
use correct file size limit
Merge branch 'staging' into 570-diff_size_limit

Conflicts:
	app/views/files/diff.html.haml
	lib/git_repository/get_diff.rb
fix errors after merging
Merge branch '570-diff_size_limit' into staging