summaryrefslogtreecommitdiff
path: root/app/views/projects/wikis
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-06-16 14:43:15 +0000
committerDouwe Maan <douwe@gitlab.com>2015-06-16 14:43:15 +0000
commitadffe47d3c1549bac13a15868a1fb8071bd0d10d (patch)
tree1c882406f0d55d99e4cb0a20988505212b751048 /app/views/projects/wikis
parentbd6239f8cf75d110b3e53eabb9395f29cdff6a21 (diff)
parenta7932fe2fd63da4864afb01bff859f4e1fbe9576 (diff)
downloadgitlab-ce-adffe47d3c1549bac13a15868a1fb8071bd0d10d.tar.gz
Merge branch 'support-comment-parallel-diff' into 'master'
Support commenting on a diff in side-by-side view ### What does this MR do? This MR adds support for commenting on a diff in side-by-side (aka parallel) view. It also fixes a JavaScript bug (see !779) when the comment button is clicked on a line that already has a comment. There is an existing bug where the comment count is not updated when a new comment is added. I'll send a MR for that later. ### Why was this MR needed? Commenting only worked in "inline" mode. Often the side-by-side view is more conducive to writing comments. ### What are the relevant issue numbers? Closes https://github.com/gitlabhq/gitlabhq/issues/9283 ### Screenshot ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/3d0a3213fde38844a681a826da18139b/image.png) See merge request !810
Diffstat (limited to 'app/views/projects/wikis')
0 files changed, 0 insertions, 0 deletions