summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-10-18 08:50:38 +0100
committerPhil Hughes <me@iamphill.com>2018-11-05 14:02:41 +0000
commitf7df9ddb52be8a03b8fbd8c9a870f3e3af577562 (patch)
tree9ee176674a1aa2a4d57b2ffcb88c03e522891529 /changelogs
parent7d4b717c92d0e2f1db07fb3de0ce356b15d2f7df (diff)
downloadgitlab-ce-f7df9ddb52be8a03b8fbd8c9a870f3e3af577562.tar.gz
Re-implemented image commenting on diffs
This re-implements image commenting in merge request diffs. This feature was previously lost when the merge request page was refactored into Vue. With this, we create an overlay component. The overlay component handles displaying the comment badges and the comment form badge. Badges are displayed based on the position attribute sent with the discussion. Comment forms for diff files are controlled through a different state property. This is so we don't tie comment forms to diff files directly creating deep nested state. Instead we create a flat array which holds the file hash & the X & Y position of the comment form. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48956
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/mr-image-commenting.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/mr-image-commenting.yml b/changelogs/unreleased/mr-image-commenting.yml
new file mode 100644
index 00000000000..3cc3becc795
--- /dev/null
+++ b/changelogs/unreleased/mr-image-commenting.yml
@@ -0,0 +1,5 @@
+---
+title: Reimplemented image commenting in merge request diffs
+merge_request:
+author:
+type: added