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
969dc0f3
Commit
969dc0f3
authored
Jan 25, 2022
by
charlie ablett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle multiple owners in notification service
parent
5e6b9a7d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
app/models/project.rb
app/models/project.rb
+4
-0
ee/app/services/ee/notification_service.rb
ee/app/services/ee/notification_service.rb
+1
-1
No files found.
app/models/project.rb
View file @
969dc0f3
...
@@ -1519,6 +1519,10 @@ class Project < ApplicationRecord
...
@@ -1519,6 +1519,10 @@ class Project < ApplicationRecord
group
||
namespace
.
try
(
:owner
)
group
||
namespace
.
try
(
:owner
)
end
end
def
owners
Array
.
wrap
(
owner
)
end
def
first_owner
def
first_owner
obj
=
owner
obj
=
owner
...
...
ee/app/services/ee/notification_service.rb
View file @
969dc0f3
...
@@ -121,7 +121,7 @@ module EE
...
@@ -121,7 +121,7 @@ module EE
end
end
def
incident_management_owners
(
project
)
def
incident_management_owners
(
project
)
return
[
project
.
owner
]
unless
project
.
group
return
project
.
owners
if
project
.
personal?
MembersFinder
MembersFinder
.
new
(
project
,
nil
,
params:
{
active_without_invites_and_requests:
true
})
.
new
(
project
,
nil
,
params:
{
active_without_invites_and_requests:
true
})
...
...
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