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
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
cc2484c3
Commit
cc2484c3
authored
Feb 01, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix sending commit note email to id instead email
parent
5857a7a9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/mailers/notify.rb
app/mailers/notify.rb
+2
-2
app/observers/note_observer.rb
app/observers/note_observer.rb
+1
-1
No files found.
app/mailers/notify.rb
View file @
cc2484c3
...
@@ -63,12 +63,12 @@ class Notify < ActionMailer::Base
...
@@ -63,12 +63,12 @@ class Notify < ActionMailer::Base
# Note
# Note
#
#
def
note_commit_email
(
commit_autor_email
,
note_id
)
def
note_commit_email
(
recipient_id
,
note_id
)
@note
=
Note
.
find
(
note_id
)
@note
=
Note
.
find
(
note_id
)
@commit
=
@note
.
noteable
@commit
=
@note
.
noteable
@commit
=
CommitDecorator
.
decorate
(
@commit
)
@commit
=
CommitDecorator
.
decorate
(
@commit
)
@project
=
@note
.
project
@project
=
@note
.
project
mail
(
to:
commit_autor_email
,
subject:
subject
(
"note for commit
#{
@commit
.
short_id
}
"
,
@commit
.
title
))
mail
(
to:
recipient
(
recipient_id
)
,
subject:
subject
(
"note for commit
#{
@commit
.
short_id
}
"
,
@commit
.
title
))
end
end
def
note_issue_email
(
recipient_id
,
note_id
)
def
note_issue_email
(
recipient_id
,
note_id
)
...
...
app/observers/note_observer.rb
View file @
cc2484c3
...
@@ -11,7 +11,7 @@ class NoteObserver < ActiveRecord::Observer
...
@@ -11,7 +11,7 @@ class NoteObserver < ActiveRecord::Observer
notify_team
(
note
)
notify_team
(
note
)
elsif
note
.
notify_author
elsif
note
.
notify_author
# Notify only author of resource
# Notify only author of resource
Notify
.
delay
.
note_commit_email
(
note
.
noteable
.
author_email
,
note
.
id
)
Notify
.
delay
.
note_commit_email
(
note
.
commit_author
.
id
,
note
.
id
)
else
else
# Otherwise ignore it
# Otherwise ignore it
nil
nil
...
...
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