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
7b4a2919
Commit
7b4a2919
authored
Jan 10, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
c089f220
da3b20f7
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
113 additions
and
110 deletions
+113
-110
app/assets/javascripts/vue_shared/components/markdown/suggestion_diff.vue
...cripts/vue_shared/components/markdown/suggestion_diff.vue
+1
-1
changelogs/unreleased/55945-suggested-change-highlight.yml
changelogs/unreleased/55945-suggested-change-highlight.yml
+5
-0
spec/fixtures/security-reports/feature-branch/gl-container-scanning-report.json
...-reports/feature-branch/gl-container-scanning-report.json
+14
-16
spec/fixtures/security-reports/master/gl-container-scanning-report.json
...security-reports/master/gl-container-scanning-report.json
+91
-91
spec/javascripts/vue_shared/components/markdown/suggestion_diff_spec.js
...ts/vue_shared/components/markdown/suggestion_diff_spec.js
+2
-2
No files found.
app/assets/javascripts/vue_shared/components/markdown/suggestion_diff.vue
View file @
7b4a2919
...
...
@@ -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"
>
...
...
changelogs/unreleased/55945-suggested-change-highlight.yml
0 → 100644
View file @
7b4a2919
---
title
:
Add syntax highlighting to suggestion diff
merge_request
:
24156
author
:
type
:
fixed
spec/fixtures/security-reports/feature-branch/gl-container-scanning-report.json
View file @
7b4a2919
{
"image"
:
"registry.gitlab.com/bikebilly/auto-devops-10-6/feature-branch:e7315ba964febb11bac8f5cd6ec433db8a3a1583"
,
"unapproved"
:
[
"CVE-2017-15650"
],
"unapproved"
:
[
"CVE-2017-15650"
],
"vulnerabilities"
:
[
{
"featurename"
:
"musl"
,
...
...
spec/fixtures/security-reports/master/gl-container-scanning-report.json
View file @
7b4a2919
spec/javascripts/vue_shared/components/markdown/suggestion_diff_spec.js
View file @
7b4a2919
...
...
@@ -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
'
,
()
=>
{
...
...
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