diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2015-03-23 22:06:19 -0600 |
|---|---|---|
| committer | Vinnie Okada <vincent@gitlab.com> | 2015-03-23 22:21:40 -0600 |
| commit | 49c3cc85c4e45cad6afef74b6d220b270290c514 (patch) | |
| tree | 594f0942ddcbf49d35704d33e54f8131db8812da | |
| parent | 6cf189f0a92772b9174f913e7c74a4889d54e9a6 (diff) | |
| download | gitlab-ce-49c3cc85c4e45cad6afef74b6d220b270290c514.tar.gz | |
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 merge commits as email patches.
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/projects/commit/_commit_box.html.haml | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 4c644960088..c7c1ae36b2b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,7 @@ v 7.10.0 (unreleased) - enable line wrapping per default and remove the checkbox to toggle it (Hannes Rosenögger) - extend the commit calendar to show the actual commits made on a date (Hannes Rosenögger) - Add a service to support external wikis (Hannes Rosenögger) + - Omit the "email patches" link and fix plain diff view for merge commits - List new commits for newly pushed branch in activity view. - Add changelog, license and contribution guide links to project sidebar. - Improve diff UI diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml index 7409f702c5d..6b1b9782f02 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 » |