Merge branch '202639' into 'master'

Update diff line content on MR diffs to use actual HTML and not CSS element

See merge request gitlab-org/gitlab!24815

app/assets/javascripts/diffs/components/diff_table_cell.vue

@@ -166,6 +166,7 @@ export default {
         :href="lineHref"
         @click="setHighlightedRow(lineCode)"
       >
+        {{ lineNumber }}
       </a>
       <diff-gutter-avatars
         v-if="shouldShowAvatarsOnGutter"

app/assets/stylesheets/pages/diff.scss

@@ -485,10 +485,6 @@ table.code {
           }
         }
       }
-
-      &:not(.js-unfold-bottom) a::before {
-        content: attr(data-linenumber);
-      }
     }
 
     &.line_content {

changelogs/unreleased/202639.yml

+---
+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

@@ -155,6 +155,10 @@ 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();