diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-07-18 16:08:09 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-07-18 16:08:09 +0000 |
| commit | 6c6988cb5ef8bb749da058b5fe1bf0e188e8062f (patch) | |
| tree | a882c775e18b558a1064e398c0c5720ae2196b22 | |
| parent | 0d488c7b8a7ab462b78daa20e0f12fe73ebb8a6d (diff) | |
| parent | 9a524da82c8f4ee31e4f0a80e2f389f11d6c2923 (diff) | |
| download | gitlab-ce-6c6988cb5ef8bb749da058b5fe1bf0e188e8062f.tar.gz | |
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
4 files changed, 5 insertions, 4 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue b/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue index 3b36bab206b..0fe0007057b 100644 --- a/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue +++ b/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue @@ -190,7 +190,6 @@ export default { </button> <a v-if="lineNumber" - v-once :data-linenumber="lineNumber" :href="lineHref" > diff --git a/app/assets/javascripts/diffs/components/inline_diff_table_row.vue b/app/assets/javascripts/diffs/components/inline_diff_table_row.vue index 0197a510ef1..0e306f39a9f 100644 --- a/app/assets/javascripts/diffs/components/inline_diff_table_row.vue +++ b/app/assets/javascripts/diffs/components/inline_diff_table_row.vue @@ -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" diff --git a/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue b/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue index ee5bb4d8d05..0031cedc68f 100644 --- a/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue +++ b/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue @@ -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" diff --git a/changelogs/unreleased/_acet-fix-expanding-context-lines.yml b/changelogs/unreleased/_acet-fix-expanding-context-lines.yml new file mode 100644 index 00000000000..41b4dbca5d6 --- /dev/null +++ b/changelogs/unreleased/_acet-fix-expanding-context-lines.yml @@ -0,0 +1,5 @@ +--- +title: Fix rendering of the context lines in MR diffs page +merge_request: 20642 +author: +type: fixed |