Skip to content
Snippets Groups Projects
Commit 25af96e4 authored by Phil Hughes's avatar Phil Hughes Committed by GitLab Release Tools Bot
Browse files

Merge branch '55945-suggested-change-highlight' into 'master'

Add syntax highlighting to suggestion diff

Closes #55945

See merge request gitlab-org/gitlab-ce!24156

(cherry picked from commit da3b20f7)

2635f2c6 Add syntax highlighting to suggestion diff
e3919efd Add unit test for syntax highlighting
95f2d284 Add changelog entry
parent fc243259
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -50,7 +50,7 @@ export default {
:help-page-path="helpPagePath"
@apply="applySuggestion"
/>
<table class="mb-3 md-suggestion-diff">
<table class="mb-3 md-suggestion-diff js-syntax-highlight code">
<tbody>
<!-- Old Line -->
<tr class="line_holder old">
Loading
Loading
---
title: Add syntax highlighting to suggestion diff
merge_request: 24156
author:
type: fixed
Loading
Loading
@@ -34,8 +34,8 @@ describe('Suggestion Diff component', () => {
expect(vm.$el.querySelector('.qa-suggestion-diff-header')).not.toBeNull();
});
 
it('renders a diff table', () => {
expect(vm.$el.querySelector('table.md-suggestion-diff')).not.toBeNull();
it('renders a diff table with syntax highlighting', () => {
expect(vm.$el.querySelector('.md-suggestion-diff.js-syntax-highlight.code')).not.toBeNull();
});
 
it('renders the oldLineNumber', () => {
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment