Commit da3b20f7 authored by Phil Hughes's avatar Phil Hughes

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

Add syntax highlighting to suggestion diff

Closes #55945

See merge request gitlab-org/gitlab-ce!24156
parents 33d69aae 7e802fee
...@@ -50,7 +50,7 @@ export default { ...@@ -50,7 +50,7 @@ export default {
:help-page-path="helpPagePath" :help-page-path="helpPagePath"
@apply="applySuggestion" @apply="applySuggestion"
/> />
<table class="mb-3 md-suggestion-diff"> <table class="mb-3 md-suggestion-diff js-syntax-highlight code">
<tbody> <tbody>
<!-- Old Line --> <!-- Old Line -->
<tr class="line_holder old"> <tr class="line_holder old">
......
---
title: Add syntax highlighting to suggestion diff
merge_request: 24156
author:
type: fixed
...@@ -34,8 +34,8 @@ describe('Suggestion Diff component', () => { ...@@ -34,8 +34,8 @@ describe('Suggestion Diff component', () => {
expect(vm.$el.querySelector('.qa-suggestion-diff-header')).not.toBeNull(); expect(vm.$el.querySelector('.qa-suggestion-diff-header')).not.toBeNull();
}); });
it('renders a diff table', () => { it('renders a diff table with syntax highlighting', () => {
expect(vm.$el.querySelector('table.md-suggestion-diff')).not.toBeNull(); expect(vm.$el.querySelector('.md-suggestion-diff.js-syntax-highlight.code')).not.toBeNull();
}); });
it('renders the oldLineNumber', () => { it('renders the oldLineNumber', () => {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment