Dmitriy Zaporozhets 5f3a758721 Merge branch 'fix-plain-diffs' into 'master' ...

Remove the email patches link for merge commits

Rugged's `to_mbox` method doesn't work for merge commits, so don't display the option to download them as email patches.  This is part of the fix for #1878, and gitlab/gitlab_git!27 allows a plain diff to be generated for a merge commit.  Together these changes should prevent the 500 errors described in the issue.

cc @sytse

See merge request !1737

2015-03-29 10:32:27 +00:00

..

_commit_box.html.haml

Merge branch 'fix-plain-diffs' into 'master'

2015-03-29 10:32:27 +00:00

branches.html.haml

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

show.html.haml

Use new diff parsing logic

2014-09-08 16:27:12 +03:00