diff options
Diffstat (limited to 'app/views/projects/diffs/_diffs.html.haml')
| -rw-r--r-- | app/views/projects/diffs/_diffs.html.haml | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/app/views/projects/diffs/_diffs.html.haml b/app/views/projects/diffs/_diffs.html.haml index 8ae433b4823..0539fb4e6d1 100644 --- a/app/views/projects/diffs/_diffs.html.haml +++ b/app/views/projects/diffs/_diffs.html.haml @@ -5,16 +5,25 @@ - diff_files = safe_diff_files(diffs, diff_refs: diff_refs, repository: project.repository) .content-block.oneline-block.files-changed - .inline-parallel-buttons - - if !expand_all_diffs? && diff_files.any? { |diff_file| diff_file.collapsed? } - = link_to 'Expand all', url_for(params.merge(expand_all_diffs: 1, format: 'html')), class: 'btn btn-default' - - if show_whitespace_toggle - - if current_controller?(:commit) - = commit_diff_whitespace_link(@project, @commit, class: 'hidden-xs') - - elsif current_controller?(:merge_requests) - = diff_merge_request_whitespace_link(@project, @merge_request, class: 'hidden-xs') - - elsif current_controller?(:compare) - = diff_compare_whitespace_link(@project, params[:from], params[:to], class: 'hidden-xs') + .inline-parallel-buttons.dropdown + %button.btn.btn-default{ type: "button", data: { toggle: "dropdown" } } + Options + %span.caret + %ul.dropdown-menu + %li + %a.is-unselectable.js-diff-comments-button{ href: "#", data: { state: "visible" } } + Hide all comments + %li + - if show_whitespace_toggle + - if current_controller?(:commit) + = commit_diff_whitespace_link(@project, @commit, {}) + - elsif current_controller?(:merge_requests) + = diff_merge_request_whitespace_link(@project, @merge_request, {}) + - elsif current_controller?(:compare) + = diff_compare_whitespace_link(@project, params[:from], params[:to]) + %li + - if !expand_all_diffs? && diff_files.any? { |diff_file| diff_file.collapsed? } + = link_to 'Expand all', url_for(params.merge(expand_all_diffs: 1, format: 'html')), class: 'is-unselectable' .btn-group = inline_diff_btn = parallel_diff_btn |