summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-07-25 22:05:30 -0600
committerDouwe Maan <douwe@selenight.nl>2016-07-25 22:05:30 -0600
commit22d3b9be4240828b4222c39f32816aba5d75a450 (patch)
tree783a6b6b5e6ae5b8f4ea3083c7da6d1a0bf02993
parentee0488d18efbf4fe3103b0d83b2056c1bebc50cf (diff)
downloadgitlab-ce-no-comment-button-on-discussion-diffs-8-10.tar.gz
Don't show comment button in gutter of diffs on MR discussion tabno-comment-button-on-discussion-diffs-8-10
-rw-r--r--CHANGELOG1
-rw-r--r--app/assets/javascripts/files_comment_button.js.coffee2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 29e28f933fa..3b607c8cb7e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
Please view this file on the master branch, on stable branches it's out of date.
v 8.10.2 (unreleased)
+ - Don't show comment button in gutter of diffs on MR discussion tab
v 8.10.1
- Refactor repository storages documentation. !5428
diff --git a/app/assets/javascripts/files_comment_button.js.coffee b/app/assets/javascripts/files_comment_button.js.coffee
index 5ab82c39fcd..28b48248596 100644
--- a/app/assets/javascripts/files_comment_button.js.coffee
+++ b/app/assets/javascripts/files_comment_button.js.coffee
@@ -16,7 +16,7 @@ class @FilesCommentButton
debounce = _.debounce @render, DEBOUNCE_TIMEOUT_DURATION
- $(document)
+ $(@filesContainerElement)
.off 'mouseover', LINE_COLUMN_CLASSES
.off 'mouseleave', LINE_COLUMN_CLASSES
.on 'mouseover', LINE_COLUMN_CLASSES, debounce