Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
41be15ac
Commit
41be15ac
authored
Oct 19, 2020
by
Jean du Plessis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add link to the note when adding a comment on an issue
parent
323c3f83
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
1 deletion
+7
-1
app/views/notify/_note_email.html.haml
app/views/notify/_note_email.html.haml
+1
-1
changelogs/unreleased/jduplessis_issue_comment_link.yml
changelogs/unreleased/jduplessis_issue_comment_link.yml
+5
-0
spec/mailers/notify_spec.rb
spec/mailers/notify_spec.rb
+1
-0
No files found.
app/views/notify/_note_email.html.haml
View file @
41be15ac
...
@@ -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
...
...
changelogs/unreleased/jduplessis_issue_comment_link.yml
0 → 100644
View file @
41be15ac
---
title
:
Add link to the note when adding a comment on an issue
merge_request
:
45511
author
:
type
:
changed
spec/mailers/notify_spec.rb
View file @
41be15ac
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment