Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
8ce9245591f0
Commit
caf4a6cf
authored
May 21, 2015
by
Jeroen van Baarsen
Browse files
Merge pull request #9278 from jvanbaarsen/pr/8755
Disabled expansion of top/bottom blobs for new file diffs
parents
309d105e47d3
42d5537b97a1
Changes
6
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
8ce92455
...
...
@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
v 7.12.0 (unreleased)
- Allow to configure location of the `.gitlab_shell_secret` file. (Jakub Jirutka)
- Disabled expansion of top/bottom blobs for new file diffs
v 7.11.0 (unreleased)
- Fix broken view when viewing history of a file that includes a path that used to be another file (Stan Hu)
...
...
app/helpers/diff_helper.rb
View file @
8ce92455
...
...
@@ -101,6 +101,10 @@ def unfold_bottom_class(bottom)
(
bottom
)
?
'js-unfold-bottom'
:
''
end
def
unfold_class
(
unfold
)
(
unfold
)
?
'unfold js-unfold'
:
''
end
def
diff_line_content
(
line
)
if
line
.
blank?
" "
...
...
app/views/projects/blob/diff.html.haml
View file @
8ce92455
...
...
@@ -2,7 +2,7 @@
-
if
@form
.
unfold?
&&
@form
.
since
!=
1
&&
!
@form
.
bottom?
%tr
.line_holder
{
id:
@form
.
since
}
=
render
"projects/diffs/match_line"
,
{
line:
@match_line
,
line_old:
@form
.
since
,
line_new:
@form
.
since
,
bottom:
false
}
line_old:
@form
.
since
,
line_new:
@form
.
since
,
bottom:
false
,
new_file:
false
}
-
@lines
.
each_with_index
do
|
line
,
index
|
-
line_new
=
index
+
@form
.
since
...
...
@@ -16,4 +16,4 @@
-
if
@form
.
unfold?
&&
@form
.
bottom?
&&
@form
.
to
<
@blob
.
loc
%tr
.line_holder
{
id:
@form
.
to
}
=
render
"projects/diffs/match_line"
,
{
line:
@match_line
,
line_old:
@form
.
to
,
line_new:
@form
.
to
,
bottom:
true
}
line_old:
@form
.
to
,
line_new:
@form
.
to
,
bottom:
true
,
new_file:
false
}
app/views/projects/diffs/_match_line.html.haml
View file @
8ce92455
%td
.old_line.diff-line-num
.unfold.js-unfold
{
data:
{
linenumber:
line_old
},
class:
unfold_bottom_class
(
bottom
)}
%td
.old_line.diff-line-num
{
data:
{
linenumber:
line_old
},
class:
[
unfold_bottom_class
(
bottom
)
,
unfold_class
(
!
new_file
)]
}
\...
%td
.new_line.diff-line-num
.unfold.js-unfold
{
data:
{
linenumber:
line_new
},
class:
unfold_bottom_class
(
bottom
)}
%td
.new_line.diff-line-num
{
data:
{
linenumber:
line_new
},
class:
[
unfold_bottom_class
(
bottom
)
,
unfold_class
(
!
new_file
)]
}
\...
%td
.line_content.matched
=
line
app/views/projects/diffs/_text_file.html.haml
View file @
8ce92455
...
...
@@ -12,7 +12,7 @@
%tr
.line_holder
{
id:
line_code
,
class:
"#{type}"
}
-
if
type
==
"match"
=
render
"projects/diffs/match_line"
,
{
line:
line
.
text
,
line_old:
line_old
,
line_new:
line
.
new_pos
,
bottom:
false
}
line_old:
line_old
,
line_new:
line
.
new_pos
,
bottom:
false
,
new_file:
diff_file
.
new_file
}
-
else
%td
.old_line
=
link_to
raw
(
type
==
"new"
?
" "
:
line_old
),
"#
#{
line_code
}
"
,
id:
line_code
...
...
@@ -29,7 +29,7 @@
-
if
last_line
>
0
=
render
"projects/diffs/match_line"
,
{
line:
""
,
line_old:
last_line
,
line_new:
last_line
,
bottom:
true
}
line_old:
last_line
,
line_new:
last_line
,
bottom:
true
,
new_file:
diff_file
.
new_file
}
-
if
diff_file
.
diff
.
blank?
&&
diff_file
.
mode_changed?
.file-mode-changed
...
...
spec/helpers/diff_helper_spec.rb
View file @
8ce92455
...
...
@@ -106,6 +106,16 @@
end
end
describe
'unfold_class'
do
it
'returns empty on false'
do
expect
(
unfold_class
(
false
)).
to
eq
(
''
)
end
it
'returns a class on true'
do
expect
(
unfold_class
(
true
)).
to
eq
(
'unfold js-unfold'
)
end
end
describe
'diff_line_content'
do
it
'should return non breaking space when line is empty'
do
...
...
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