Commit 3dc9a67c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #7898 from cirosantilli/hide-wrap-text-mr-binary

Only show text wrap and diff notes for text in merge requests.
parents 8163a43c da4eff4a
...@@ -15,15 +15,16 @@ ...@@ -15,15 +15,16 @@
%span.file-mode= "#{diff_file.diff.a_mode}#{diff_file.diff.b_mode}" %span.file-mode= "#{diff_file.diff.a_mode}#{diff_file.diff.b_mode}"
.diff-btn-group .diff-btn-group
- unless params[:view] == 'parallel' - if blob.text?
%label - unless params[:view] == 'parallel'
= check_box_tag nil, 1, false, class: "js-toggle-diff-line-wrap" %label
Wrap text = 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 = link_to '#', class: 'js-toggle-diff-comments btn btn-small' do
Diff comments %i.icon-chevron-down
  Diff comments
 
- if @merge_request && @merge_request.source_project - 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 = 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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment