Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
120f032b
Commit
120f032b
authored
Mar 17, 2015
by
Hannes Rosenögger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
enable line wrapping by default and remove the checkbox to change it
parent
dbd347bf
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
20 deletions
+2
-20
CHANGELOG
CHANGELOG
+1
-0
app/assets/javascripts/behaviors/toggle_diff_line_wrap_behavior.coffee
...vascripts/behaviors/toggle_diff_line_wrap_behavior.coffee
+0
-14
app/views/projects/diffs/_file.html.haml
app/views/projects/diffs/_file.html.haml
+1
-6
No files found.
CHANGELOG
View file @
120f032b
Please view this file on the master branch, on stable branches it's out of date.
Please view this file on the master branch, on stable branches it's out of date.
v 7.10.0 (unreleased)
v 7.10.0 (unreleased)
- enable line wrapping per default and remove the checkbox to toggle it (Hannes Rosenögger)
- Add a service to support external wikis (Hannes Rosenögger)
- Add a service to support external wikis (Hannes Rosenögger)
v 7.9.0 (unreleased)
v 7.9.0 (unreleased)
...
...
app/assets/javascripts/behaviors/toggle_diff_line_wrap_behavior.coffee
deleted
100644 → 0
View file @
dbd347bf
$
->
# Toggle line wrapping in diff.
#
# %div.diff-file
# %input.js-toggle-diff-line-wrap
# %td.line_content
#
$
(
"body"
).
on
"click"
,
".js-toggle-diff-line-wrap"
,
(
e
)
->
diffFile
=
$
(
@
).
closest
(
".diff-file"
)
if
$
(
@
).
is
(
":checked"
)
diffFile
.
addClass
(
"diff-wrap-lines"
)
else
diffFile
.
removeClass
(
"diff-wrap-lines"
)
app/views/projects/diffs/_file.html.haml
View file @
120f032b
...
@@ -22,11 +22,6 @@
...
@@ -22,11 +22,6 @@
.diff-btn-group
.diff-btn-group
-
if
blob
.
text?
-
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-sm'
do
=
link_to
'#'
,
class:
'js-toggle-diff-comments btn btn-sm'
do
%i
.fa.fa-chevron-down
%i
.fa.fa-chevron-down
Show/Hide comments
Show/Hide comments
...
@@ -39,7 +34,7 @@
...
@@ -39,7 +34,7 @@
=
view_file_btn
(
@commit
.
id
,
diff_file
,
project
)
=
view_file_btn
(
@commit
.
id
,
diff_file
,
project
)
.diff-content
.diff-content
.diff-wrap-lines
-# Skipp all non non-supported blobs
-# Skipp all non non-supported blobs
-
return
unless
blob
.
respond_to?
(
'text?'
)
-
return
unless
blob
.
respond_to?
(
'text?'
)
-
if
blob
.
text?
-
if
blob
.
text?
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment