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
c762ed60
Commit
c762ed60
authored
Mar 11, 2020
by
Paul Slaughter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch '202639' into 'master'"
This reverts merge request !24815
parent
0c652914
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
10 deletions
+4
-10
app/assets/javascripts/diffs/components/diff_table_cell.vue
app/assets/javascripts/diffs/components/diff_table_cell.vue
+0
-1
app/assets/stylesheets/pages/diff.scss
app/assets/stylesheets/pages/diff.scss
+4
-0
changelogs/unreleased/202639.yml
changelogs/unreleased/202639.yml
+0
-5
spec/frontend/diffs/components/diff_table_cell_spec.js
spec/frontend/diffs/components/diff_table_cell_spec.js
+0
-4
No files found.
app/assets/javascripts/diffs/components/diff_table_cell.vue
View file @
c762ed60
...
...
@@ -166,7 +166,6 @@ export default {
:href=
"lineHref"
@
click=
"setHighlightedRow(lineCode)"
>
{{
lineNumber
}}
</a>
<diff-gutter-avatars
v-if=
"shouldShowAvatarsOnGutter"
...
...
app/assets/stylesheets/pages/diff.scss
View file @
c762ed60
...
...
@@ -485,6 +485,10 @@ table.code {
}
}
}
&
:not
(
.js-unfold-bottom
)
a
::before
{
content
:
attr
(
data-linenumber
);
}
}
&
.line_content
{
...
...
changelogs/unreleased/202639.yml
deleted
100644 → 0
View file @
0c652914
---
title
:
Replace line diff number css selector with actual HTML inside MRs
merge_request
:
author
:
Oregand
type
:
other
spec/frontend/diffs/components/diff_table_cell_spec.js
View file @
c762ed60
...
...
@@ -155,10 +155,6 @@ describe('DiffTableCell', () => {
});
});
it
(
'
renders the correct line number
'
,
()
=>
{
expect
(
findLineNumber
().
text
()).
toEqual
(
TEST_LINE_NUMBER
.
toString
());
});
it
(
'
on click, dispatches setHighlightedRow
'
,
()
=>
{
expect
(
store
.
dispatch
).
not
.
toHaveBeenCalled
();
...
...
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