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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
40890794
Commit
40890794
authored
Mar 23, 2019
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove now-unnecessary noteable_line class
parent
de28402c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
app/views/projects/blob/diff.html.haml
app/views/projects/blob/diff.html.haml
+3
-3
app/views/projects/diffs/_line.html.haml
app/views/projects/diffs/_line.html.haml
+1
-1
app/views/projects/diffs/_parallel_view.html.haml
app/views/projects/diffs/_parallel_view.html.haml
+2
-2
spec/javascripts/diffs/mock_data/diff_discussions.js
spec/javascripts/diffs/mock_data/diff_discussions.js
+1
-1
No files found.
app/views/projects/blob/diff.html.haml
View file @
40890794
...
@@ -15,14 +15,14 @@
...
@@ -15,14 +15,14 @@
%a
{
href:
"#"
,
data:
{
linenumber:
line_number_old
},
disabled:
true
}
%a
{
href:
"#"
,
data:
{
linenumber:
line_number_old
},
disabled:
true
}
%td
.new_line.diff-line-num
{
data:
{
linenumber:
line_number_new
}
}
%td
.new_line.diff-line-num
{
data:
{
linenumber:
line_number_new
}
}
%a
{
href:
"#"
,
data:
{
linenumber:
line_number_new
},
disabled:
true
}
%a
{
href:
"#"
,
data:
{
linenumber:
line_number_new
},
disabled:
true
}
%td
.line_content
.noteable_line
{
class:
line_class
}=
line
%td
.line_content
{
class:
line_class
}=
line
-
when
:parallel
-
when
:parallel
%td
.old_line.diff-line-num
{
data:
{
linenumber:
line_number_old
}
}
%td
.old_line.diff-line-num
{
data:
{
linenumber:
line_number_old
}
}
%a
{
href:
"##{line_number_old}"
,
data:
{
linenumber:
line_number_old
},
disabled:
true
}
%a
{
href:
"##{line_number_old}"
,
data:
{
linenumber:
line_number_old
},
disabled:
true
}
%td
.line_content.
noteable_line.
left-side
{
class:
line_class
}=
line
%td
.line_content.left-side
{
class:
line_class
}=
line
%td
.new_line.diff-line-num
{
data:
{
linenumber:
line_number_new
}
}
%td
.new_line.diff-line-num
{
data:
{
linenumber:
line_number_new
}
}
%a
{
href:
"##{line_number_new}"
,
data:
{
linenumber:
line_number_new
},
disabled:
true
}
%a
{
href:
"##{line_number_new}"
,
data:
{
linenumber:
line_number_new
},
disabled:
true
}
%td
.line_content.
noteable_line.
right-side
{
class:
line_class
}=
line
%td
.line_content.right-side
{
class:
line_class
}=
line
-
if
@form
.
unfold?
&&
@form
.
bottom?
&&
@form
.
to
<
@blob
.
lines
.
size
-
if
@form
.
unfold?
&&
@form
.
bottom?
&&
@form
.
to
<
@blob
.
lines
.
size
%tr
.line_holder
{
id:
@form
.
to
,
class:
line_class
}
%tr
.line_holder
{
id:
@form
.
to
,
class:
line_class
}
...
...
app/views/projects/diffs/_line.html.haml
View file @
40890794
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
=
link_text
=
link_text
-
else
-
else
%a
{
href:
"##{line_code}"
,
data:
{
linenumber:
link_text
}
}
%a
{
href:
"##{line_code}"
,
data:
{
linenumber:
link_text
}
}
%td
.line_content
.noteable_line
{
class:
type
}
<
%td
.line_content
{
class:
type
}
<
-
if
email
-
if
email
%pre
=
line
.
rich_text
%pre
=
line
.
rich_text
-
else
-
else
...
...
app/views/projects/diffs/_parallel_view.html.haml
View file @
40890794
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
-
discussion_left
=
discussions_left
.
try
(
:first
)
-
discussion_left
=
discussions_left
.
try
(
:first
)
-
if
discussion_left
&&
discussion_left
.
resolvable?
-
if
discussion_left
&&
discussion_left
.
resolvable?
%diff-note-avatars
{
"discussion-id"
=>
discussion_left
.
id
}
%diff-note-avatars
{
"discussion-id"
=>
discussion_left
.
id
}
%td
.line_content.parallel.
noteable_line.
left-side
{
id:
left_line_code
,
class:
left
.
type
}=
diff_line_content
(
left
.
rich_text
)
%td
.line_content.parallel.left-side
{
id:
left_line_code
,
class:
left
.
type
}=
diff_line_content
(
left
.
rich_text
)
-
else
-
else
%td
.old_line.diff-line-num.empty-cell
%td
.old_line.diff-line-num.empty-cell
%td
.line_content.parallel.left-side
%td
.line_content.parallel.left-side
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
-
discussion_right
=
discussions_right
.
try
(
:first
)
-
discussion_right
=
discussions_right
.
try
(
:first
)
-
if
discussion_right
&&
discussion_right
.
resolvable?
-
if
discussion_right
&&
discussion_right
.
resolvable?
%diff-note-avatars
{
"discussion-id"
=>
discussion_right
.
id
}
%diff-note-avatars
{
"discussion-id"
=>
discussion_right
.
id
}
%td
.line_content.parallel.
noteable_line.
right-side
{
id:
right_line_code
,
class:
right
.
type
}=
diff_line_content
(
right
.
rich_text
)
%td
.line_content.parallel.right-side
{
id:
right_line_code
,
class:
right
.
type
}=
diff_line_content
(
right
.
rich_text
)
-
else
-
else
%td
.old_line.diff-line-num.empty-cell
%td
.old_line.diff-line-num.empty-cell
%td
.line_content.parallel.right-side
%td
.line_content.parallel.right-side
...
...
spec/javascripts/diffs/mock_data/diff_discussions.js
View file @
40890794
...
@@ -496,7 +496,7 @@ export default {
...
@@ -496,7 +496,7 @@ export default {
{
{
text
:
'
line
'
,
text
:
'
line
'
,
rich_text
:
rich_text
:
'
<tr class="line_holder new" id="">
\n
<td class="diff-line-num new old_line" data-linenumber="1">
\n
\n
</td>
\n
<td class="diff-line-num new new_line" data-linenumber="1">
\n
1
\n
</td>
\n
<td class="line_content new
noteable_line"><span id="LC1" class="line" lang="plaintext"> - Bad dates</span>
\n
</td>
\n
</tr>
\n
<tr class="line_holder new" id="">
\n
<td class="diff-line-num new old_line" data-linenumber="1">
\n
\n
</td>
\n
<td class="diff-line-num new new_line" data-linenumber="2">
\n
2
\n
</td>
\n
<td class="line_content new noteable_line
"><span id="LC2" class="line" lang="plaintext"></span>
\n
</td>
\n
</tr>
\n
'
,
'
<tr class="line_holder new" id="">
\n
<td class="diff-line-num new old_line" data-linenumber="1">
\n
\n
</td>
\n
<td class="diff-line-num new new_line" data-linenumber="1">
\n
1
\n
</td>
\n
<td class="line_content new
"><span id="LC1" class="line" lang="plaintext"> - Bad dates</span>
\n
</td>
\n
</tr>
\n
<tr class="line_holder new" id="">
\n
<td class="diff-line-num new old_line" data-linenumber="1">
\n
\n
</td>
\n
<td class="diff-line-num new new_line" data-linenumber="2">
\n
2
\n
</td>
\n
<td class="line_content new
"><span id="LC2" class="line" lang="plaintext"></span>
\n
</td>
\n
</tr>
\n
'
,
can_receive_suggestion
:
true
,
can_receive_suggestion
:
true
,
line_code
:
'
6f209374f7e565f771b95720abf46024c41d1885_1_1
'
,
line_code
:
'
6f209374f7e565f771b95720abf46024c41d1885_1_1
'
,
type
:
'
new
'
,
type
:
'
new
'
,
...
...
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