cherry-pick from gitlabhq  83f811fff5f6b2188c82f187f747122d2f7cd936

Merged in gitlabhq commit  83f811fff5f6b2188c82f187f747122d2f7cd936 which adds scrollbars to the side by side diff