summaryrefslogtreecommitdiff
path: root/app/helpers/notes_helper.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-07-28 16:53:10 +0000
committerDouwe Maan <douwe@gitlab.com>2017-07-28 16:53:10 +0000
commit8b68b69572cf2aa47ba497c119470131085f95f0 (patch)
tree6bb94a7a18f2e107be21dfb330b97b523bd1cf60 /app/helpers/notes_helper.rb
parent7e83f244ca8c009ec79e14467bbb06c177ce1b8e (diff)
parent75d04f6a29a5506ffd53c227517411febdc54910 (diff)
downloadgitlab-ce-8b68b69572cf2aa47ba497c119470131085f95f0.tar.gz
Merge branch 'fix-replying-to-commit-comment-in-mr-from-fork' into 'master'
Fix replying to commit comments on merge requests created from forks Closes #31772 See merge request !13137
Diffstat (limited to 'app/helpers/notes_helper.rb')
-rw-r--r--app/helpers/notes_helper.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/helpers/notes_helper.rb b/app/helpers/notes_helper.rb
index 505579674c9..e857e837c16 100644
--- a/app/helpers/notes_helper.rb
+++ b/app/helpers/notes_helper.rb
@@ -62,7 +62,11 @@ module NotesHelper
def link_to_reply_discussion(discussion, line_type = nil)
return unless current_user
- data = { discussion_id: discussion.reply_id, line_type: line_type }
+ data = {
+ discussion_id: discussion.reply_id,
+ discussion_project_id: discussion.project&.id,
+ line_type: line_type
+ }
button_tag 'Reply...', class: 'btn btn-text-field js-discussion-reply-button',
data: data, title: 'Add a reply'