diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2017-07-06 12:43:51 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-07-06 12:43:51 -0400 |
| commit | eef068754af7437baf327c5cb4e2b454ba40a617 (patch) | |
| tree | 3583327140b2994432de317b4ac06d66b274b430 /app/views/projects/diffs/_warning.html.haml | |
| parent | 9eeba8fb49c5da7cf0b2c22bc33cbd33a83918ed (diff) | |
| parent | 9274c3c1598f3ff32339e681d5812feeb0f62605 (diff) | |
| download | gitlab-ce-eef068754af7437baf327c5cb4e2b454ba40a617.tar.gz | |
Merge branch 'master' into rs-sign_in
Diffstat (limited to 'app/views/projects/diffs/_warning.html.haml')
| -rw-r--r-- | app/views/projects/diffs/_warning.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/diffs/_warning.html.haml b/app/views/projects/diffs/_warning.html.haml index 402c18c447e..da34a83d8e0 100644 --- a/app/views/projects/diffs/_warning.html.haml +++ b/app/views/projects/diffs/_warning.html.haml @@ -3,8 +3,8 @@ Too many changes to show. .pull-right - if current_controller?(:commit) - = link_to "Plain diff", namespace_project_commit_path(@project.namespace, @project, @commit, format: :diff), class: "btn btn-sm" - = link_to "Email patch", namespace_project_commit_path(@project.namespace, @project, @commit, format: :patch), class: "btn btn-sm" + = link_to "Plain diff", project_commit_path(@project, @commit, format: :diff), class: "btn btn-sm" + = link_to "Email patch", project_commit_path(@project, @commit, format: :patch), class: "btn btn-sm" - elsif current_controller?('projects/merge_requests/diffs') && @merge_request&.persisted? = link_to "Plain diff", merge_request_path(@merge_request, format: :diff), class: "btn btn-sm" = link_to "Email patch", merge_request_path(@merge_request, format: :patch), class: "btn btn-sm" |