Merge branch '_acet-fix-expanding-context-lines' into 'master'

Fix rendering context lines on MR diffs

Closes #49242 and #49343

See merge request gitlab-org/gitlab-ce!20642
This commit is contained in:
Tim Zallmann 2018-07-18 16:08:09 +00:00
commit 6c6988cb5e
4 changed files with 5 additions and 4 deletions

View file

@ -190,7 +190,6 @@ export default {
</button>
<a
v-if="lineNumber"
v-once
:data-linenumber="lineNumber"
:href="lineHref"
>

View file

@ -101,7 +101,6 @@ export default {
class="diff-line-num new_line"
/>
<td
v-once
:class="line.type"
class="line_content"
v-html="line.richText"

View file

@ -119,7 +119,6 @@ export default {
class="diff-line-num old_line"
/>
<td
v-once
:id="line.left.lineCode"
:class="parallelViewLeftLineType"
class="line_content parallel left-side"
@ -140,7 +139,6 @@ export default {
class="diff-line-num new_line"
/>
<td
v-once
:id="line.right.lineCode"
:class="line.right.type"
class="line_content parallel right-side"

View file

@ -0,0 +1,5 @@
---
title: Fix rendering of the context lines in MR diffs page
merge_request: 20642
author:
type: fixed