diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-02-29 17:59:56 +0300 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-02-29 17:59:56 +0300 |
| commit | 7b689fb5253194132f83fcbabc5c8be24d664127 (patch) | |
| tree | 6fd8340c036869cd4efb1ad090eda61fe6a462aa /app | |
| parent | 912e64381543c38ccf2e0d5f22b9986f49879278 (diff) | |
| parent | 2f0c3ca35242045f889816bc16fdb8577830b831 (diff) | |
Merge branch 'too-many-changes-btns' into 'master'
Changed too many changes buttons to white
Closes #13751
See merge request !3002
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/diffs/_warning.html.haml | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/app/views/projects/diffs/_warning.html.haml b/app/views/projects/diffs/_warning.html.haml index f99bc9a85eb..63ede71e6f1 100644 --- a/app/views/projects/diffs/_warning.html.haml +++ b/app/views/projects/diffs/_warning.html.haml @@ -3,17 +3,16 @@ Too many changes to show. .pull-right - unless diff_hard_limit_enabled? - = link_to "Reload with full diff", url_for(params.merge(force_show_diff: true, format: nil)), class: "btn btn-sm btn-warning" + = link_to "Reload with full diff", url_for(params.merge(force_show_diff: true, format: nil)), class: "btn btn-sm" - if current_controller?(:commit) or current_controller?(:merge_requests) - if current_controller?(:commit) - = link_to "Plain diff", namespace_project_commit_path(@project.namespace, @project, @commit, format: :diff), class: "btn btn-warning btn-sm" - = link_to "Email patch", namespace_project_commit_path(@project.namespace, @project, @commit, format: :patch), class: "btn btn-warning btn-sm" + = 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" - elsif @merge_request && @merge_request.persisted? - = link_to "Plain diff", merge_request_path(@merge_request, format: :diff), class: "btn btn-warning btn-sm" - = link_to "Email patch", merge_request_path(@merge_request, format: :patch), class: "btn btn-warning btn-sm" + = 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" %p To preserve performance only %strong #{shown_files_count} of #{diffs.size} files are displayed. - |