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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
f9303eec
Commit
f9303eec
authored
Feb 14, 2019
by
Annabel Dunstone Gray
Committed by
Phil Hughes
Feb 14, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add fix for suggested changes syntax highlighting
Removed the `note-text` class since it conflicted other classes.
parent
750e3c67
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
5 deletions
+7
-5
app/assets/javascripts/notes/components/note_body.vue
app/assets/javascripts/notes/components/note_body.vue
+1
-0
app/assets/javascripts/vue_shared/components/markdown/suggestions.vue
...avascripts/vue_shared/components/markdown/suggestions.vue
+1
-1
app/assets/stylesheets/framework/mixins.scss
app/assets/stylesheets/framework/mixins.scss
+0
-4
changelogs/unreleased/syntax-highlighting-again.yml
changelogs/unreleased/syntax-highlighting-again.yml
+5
-0
No files found.
app/assets/javascripts/notes/components/note_body.vue
View file @
f9303eec
...
...
@@ -95,6 +95,7 @@ export default {
<div
ref=
"note-body"
:class=
"
{ 'js-task-list-container': canEdit }" class="note-body">
<suggestions
v-if=
"hasSuggestion && !isEditing"
class=
"note-text md"
:suggestions=
"note.suggestions"
:note-html=
"note.note_html"
:line-type=
"lineType"
...
...
app/assets/javascripts/vue_shared/components/markdown/suggestions.vue
View file @
f9303eec
...
...
@@ -130,6 +130,6 @@ export default {
<
template
>
<div>
<div
class=
"flash-container js-suggestions-flash"
></div>
<div
v-show=
"isRendered"
ref=
"container"
class=
"note-text md"
v-html=
"noteHtml"
></div>
<div
v-show=
"isRendered"
ref=
"container"
v-html=
"noteHtml"
></div>
</div>
</
template
>
app/assets/stylesheets/framework/mixins.scss
View file @
f9303eec
...
...
@@ -36,10 +36,6 @@
width
:
fit-content
;
}
tbody
{
background-color
:
$white-light
;
}
tr
{
th
{
border-bottom
:
solid
2px
$gl-gray-100
;
...
...
changelogs/unreleased/syntax-highlighting-again.yml
0 → 100644
View file @
f9303eec
---
title
:
Fix suggested changes syntax highlighting
merge_request
:
25116
author
:
type
:
fixed
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