From da4eff4addb89caa8afebf7ec9fb836864a9255e Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Mon, 29 Sep 2014 14:48:05 +0200 Subject: [PATCH] Only show text wrap and diff notes for text in MR. --- app/views/projects/diffs/_file.html.haml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml index be9389172b7..751df6a02e9 100644 --- a/app/views/projects/diffs/_file.html.haml +++ b/app/views/projects/diffs/_file.html.haml @@ -15,15 +15,16 @@ %span.file-mode= "#{diff_file.diff.a_mode} → #{diff_file.diff.b_mode}" .diff-btn-group - - unless params[:view] == 'parallel' - %label - = check_box_tag nil, 1, false, class: "js-toggle-diff-line-wrap" - Wrap text -   - = link_to "#", class: "js-toggle-diff-comments btn btn-small" do - %i.icon-chevron-down - Diff comments -   + - if blob.text? + - unless params[:view] == 'parallel' + %label + = check_box_tag nil, 1, false, class: 'js-toggle-diff-line-wrap' + Wrap text +   + = link_to '#', class: 'js-toggle-diff-comments btn btn-small' do + %i.icon-chevron-down + Diff comments +   - if @merge_request && @merge_request.source_project = link_to project_edit_tree_path(@merge_request.source_project, tree_join(@merge_request.source_branch, diff_file.new_path), from_merge_request_id: @merge_request.id), { class: 'btn btn-small' } do -- GitLab