diff options
| author | Natalia Tepluhina <ntepluhina@gitlab.com> | 2019-07-08 12:49:48 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-07-08 12:49:48 +0300 |
| commit | aeb2efaba2da5eaef150dfb21a29166d9bc27750 (patch) | |
| tree | 957463c6873be5425f2bc934d0dedf8068396aa8 /app/assets/javascripts/diffs/components/inline_diff_view.vue | |
| parent | 5214ad1a7f3720b8ea05f1fb99189d2be48f39ec (diff) | |
Backported EE fix to CE
- fixed attribute to be not hyphenated
- applied parallel diffs view on CE
- separated left and right drafts
- added fallback for hasDrafts
Diffstat (limited to 'app/assets/javascripts/diffs/components/inline_diff_view.vue')
| -rw-r--r-- | app/assets/javascripts/diffs/components/inline_diff_view.vue | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/diffs/components/inline_diff_view.vue b/app/assets/javascripts/diffs/components/inline_diff_view.vue index 8c76a555b62..b2bc3d9914f 100644 --- a/app/assets/javascripts/diffs/components/inline_diff_view.vue +++ b/app/assets/javascripts/diffs/components/inline_diff_view.vue @@ -57,6 +57,7 @@ export default { :diff-file-hash="diffFile.file_hash" :line="line" :help-page-path="helpPagePath" + :has-draft="shouldRenderDraftRow(diffFile.file_hash, line) || false" /> <inline-draft-comment-row v-if="shouldRenderDraftRow(diffFile.file_hash, line)" |