Commit 08c1a5b1 authored by charlie ablett's avatar charlie ablett

Merge branch 'jduplessis_issue_comment_link' into 'master'

Add link to the note when adding a comment on an issue

See merge request gitlab-org/gitlab!45511
parents f209362f 78669e23
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
= succeed ':' do = succeed ':' do
= link_to note.author_name, user_url(note.author) = link_to note.author_name, user_url(note.author)
- if discussion.nil? - if discussion.nil?
commented = link_to 'commented', target_url
- else - else
- if note.start_of_discussion? - if note.start_of_discussion?
started a new started a new
......
---
title: Add link to the note on the email sent after adding a comment on an issue
merge_request: 45511
author:
type: changed
...@@ -619,6 +619,7 @@ RSpec.describe Notify do ...@@ -619,6 +619,7 @@ RSpec.describe Notify do
let(:mailer) do let(:mailer) do
mailer = described_class.new mailer = described_class.new
mailer.instance_variable_set(:@note, mail_thread_note) mailer.instance_variable_set(:@note, mail_thread_note)
mailer.instance_variable_set(:@target_url, "https://some.link")
mailer mailer
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment