summaryrefslogtreecommitdiff
path: root/app/views/projects/diffs
diff options
context:
space:
mode:
authorHannes Rosenögger <123haynes@gmail.com>2015-03-17 15:39:21 +0100
committerHannes Rosenögger <123haynes@gmail.com>2015-03-18 08:46:53 +0100
commit120f032b1a6c7df431da6821d22c806b6c9bf4ca (patch)
tree7e9b1695c2c737bbcb559a4f144b9471e9b22c6d /app/views/projects/diffs
parentdbd347bfa00e133da8ac178612ed8c30ef871ca4 (diff)
downloadgitlab-ce-120f032b1a6c7df431da6821d22c806b6c9bf4ca.tar.gz
enable line wrapping by default and remove the checkbox to change it
Diffstat (limited to 'app/views/projects/diffs')
-rw-r--r--app/views/projects/diffs/_file.html.haml7
1 files changed, 1 insertions, 6 deletions
diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml
index 36d98b26712..a9e4d63cd98 100644
--- a/app/views/projects/diffs/_file.html.haml
+++ b/app/views/projects/diffs/_file.html.haml
@@ -22,11 +22,6 @@
.diff-btn-group
- if blob.text?
- - unless params[:view] == 'parallel'
- %label
- = check_box_tag nil, 1, false, class: 'js-toggle-diff-line-wrap'
- Wrap text
- &nbsp;
= link_to '#', class: 'js-toggle-diff-comments btn btn-sm' do
%i.fa.fa-chevron-down
Show/Hide comments
@@ -39,7 +34,7 @@
= view_file_btn(@commit.id, diff_file, project)
- .diff-content
+ .diff-content.diff-wrap-lines
-# Skipp all non non-supported blobs
- return unless blob.respond_to?('text?')
- if blob.text?