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
dedea067
Commit
dedea067
authored
Mar 04, 2020
by
Sean Arnold
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use owners_and_maintainers_without_invites method
- Use maintainers over masters
parent
ced9b0ca
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
9 deletions
+3
-9
ee/app/services/ee/notification_service.rb
ee/app/services/ee/notification_service.rb
+3
-9
No files found.
ee/app/services/ee/notification_service.rb
View file @
dedea067
...
...
@@ -38,13 +38,7 @@ module EE
def
mirror_was_hard_failed
(
project
)
return
if
project
.
emails_disabled?
recipients
=
project
.
members
.
active_without_invites_and_requests
.
owners_and_maintainers
if
recipients
.
empty?
&&
project
.
group
recipients
=
project
.
group
.
members
.
active_without_invites_and_requests
.
owners_and_maintainers
end
recipients
.
each
do
|
recipient
|
owners_and_maintainers_without_invites
.
each
do
|
recipient
|
mailer
.
mirror_was_hard_failed_email
(
project
.
id
,
recipient
.
user
.
id
).
deliver_later
end
end
...
...
@@ -78,10 +72,10 @@ module EE
private
def
owners_and_maintainers_without_invites
(
project
)
recipients
=
project
.
members
.
active_without_invites_and_requests
.
owners_and_ma
st
ers
recipients
=
project
.
members
.
active_without_invites_and_requests
.
owners_and_ma
intain
ers
if
recipients
.
empty?
&&
project
.
group
recipients
=
project
.
group
.
members
.
active_without_invites_and_requests
.
owners_and_ma
st
ers
recipients
=
project
.
group
.
members
.
active_without_invites_and_requests
.
owners_and_ma
intain
ers
end
recipients
...
...
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