diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-29 10:32:27 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-29 10:32:27 +0000 |
| commit | 5f3a7587215a4ff25d3fca0e0aded3b76bc9ac57 (patch) | |
| tree | 1d7cbb5767f7b6e8667bb132911e02d779e54bbf /app | |
| parent | 0154338ed81b495b9a8e5f9ba0ef5c218554401f (diff) | |
| parent | fabaeb096fad0307308c9af3b617a5c7a69734e6 (diff) | |
| download | gitlab-ce-5f3a7587215a4ff25d3fca0e0aded3b76bc9ac57.tar.gz | |
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
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/commit/_commit_box.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml index 2579f2cac92..3f645b81397 100644 --- a/app/views/projects/commit/_commit_box.html.haml +++ b/app/views/projects/commit/_commit_box.html.haml @@ -10,7 +10,8 @@ Download as %span.caret %ul.dropdown-menu - %li= link_to "Email Patches", namespace_project_commit_path(@project.namespace, @project, @commit, format: :patch) + - unless @commit.parents.length > 1 + %li= link_to "Email Patches", namespace_project_commit_path(@project.namespace, @project, @commit, format: :patch) %li= link_to "Plain Diff", namespace_project_commit_path(@project.namespace, @project, @commit, format: :diff) = link_to namespace_project_tree_path(@project.namespace, @project, @commit), class: "btn btn-primary btn-grouped" do %span Browse Code ยป |