diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-11-13 22:44:14 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-11-13 22:44:14 +0000 |
| commit | da521deb5fa8bf48a3f26805468362e7b7ca71a8 (patch) | |
| tree | 1878a985a34f2b33fbd3f878069b609479c07809 /app/assets/javascripts/vue_shared | |
| parent | a4729ffad59dd12bde8c938af09fe4a2235445b6 (diff) | |
| parent | 73d3cb8c8995f4c3a875183adbb0e43d6c795759 (diff) | |
| download | gitlab-ce-da521deb5fa8bf48a3f26805468362e7b7ca71a8.tar.gz | |
Merge branch 'enable-image-comments-for-renamed-files' into 'master'
Fixed image commenting on moved files
See merge request gitlab-org/gitlab-ce!23023
Diffstat (limited to 'app/assets/javascripts/vue_shared')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue index e68a2aa73fa..d7f24c1afc5 100644 --- a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue +++ b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue @@ -44,8 +44,11 @@ export default { isNew() { return this.diffMode === diffModes.new; }, + isRenamed() { + return this.diffMode === diffModes.renamed; + }, imagePath() { - return this.isNew ? this.newPath : this.oldPath; + return this.isNew || this.isRenamed ? this.newPath : this.oldPath; }, }, methods: { @@ -114,7 +117,7 @@ export default { }]" > <slot - v-if="isNew" + v-if="isNew || isRenamed" slot="image-overlay" name="image-overlay" > |