kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Only show text wrap and diff notes for text in MR.

Browse source
This commit is contained in:
Ciro Santilli 2014-09-29 14:48:05 +02:00
parent 376e004c16
commit da4eff4add
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/views/projects/diffs/_file.html.haml
View file

@ -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