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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
4b7f035a
Commit
4b7f035a
authored
Jul 05, 2018
by
Sean McGivern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Extract EE-specific lines from NotificationService
parent
bf9fd9c3
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
0 deletions
+6
-0
app/services/notification_service.rb
app/services/notification_service.rb
+6
-0
No files found.
app/services/notification_service.rb
View file @
4b7f035a
...
...
@@ -135,6 +135,8 @@ class NotificationService
# * watchers of the mr's labels
# * users with custom level checked with "new merge request"
#
# In EE, approvers of the merge request are also included
#
def
new_merge_request
(
merge_request
,
current_user
)
new_resource_email
(
merge_request
,
:new_merge_request_email
)
end
...
...
@@ -256,6 +258,10 @@ class NotificationService
# ignore gitlab service messages
return
true
if
note
.
cross_reference?
&&
note
.
system?
send_new_note_notifications
(
note
)
end
def
send_new_note_notifications
(
note
)
notify_method
=
"note_
#{
note
.
to_ability_name
}
_email"
.
to_sym
recipients
=
NotificationRecipientService
.
build_new_note_recipients
(
note
)
...
...
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