Fix final line in EmailsOnPush email diff being rendered as error.

Fixes https://github.com/gitlabhq/gitlabhq/issues/8976 and private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2194.

Pulls in gitlab_git 7.1.5, which includes https://gitlab.com/gitlab-org/gitlab_git/merge_requests/18.

Added 65 commits:

• a2e0aee7...33a8f53f - 63 commits from branch master
• 08eac512 - Move EmailsOnPush highlight CSS inline instead of being in every notification email.
• 5ad0eb43 - Update gitlab_git to 7.1.5, to fix final line in EmailsOnPush email diff being rendered as error.

Added 1 commit:

• cef0fe24 - Update gitlab_git to 7.1.6 because 7.1.5 had broken language detection.

Reassigned to @dzaporozhets

@DouweM what a sense of pre if you move diff out of it?

I saw that the Rugments HTML formatter already adds <pre> around the code, so we ended up with double <pre><pre>... which I fixed here. Should've been a different commit.

Thanks

Status changed to merged

mentioned in commit 18dfe0ce

mentioned in commit 1f2b1e46