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
b0046bf1
Commit
b0046bf1
authored
Jun 13, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
5119c530
21bf8555
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
1 deletion
+16
-1
app/mailers/repository_check_mailer.rb
app/mailers/repository_check_mailer.rb
+1
-1
changelogs/unreleased/sh-omit-blocked-admins-from-notification.yml
...s/unreleased/sh-omit-blocked-admins-from-notification.yml
+5
-0
spec/mailers/repository_check_mailer_spec.rb
spec/mailers/repository_check_mailer_spec.rb
+10
-0
No files found.
app/mailers/repository_check_mailer.rb
View file @
b0046bf1
...
...
@@ -15,7 +15,7 @@ class RepositoryCheckMailer < BaseMailer
end
mail
(
to:
User
.
admins
.
pluck
(
:email
),
to:
User
.
admins
.
active
.
pluck
(
:email
),
subject:
"GitLab Admin |
#{
@message
}
"
)
end
...
...
changelogs/unreleased/sh-omit-blocked-admins-from-notification.yml
0 → 100644
View file @
b0046bf1
---
title
:
Omit blocked admins from repository check e-mails
merge_request
:
29507
author
:
type
:
fixed
spec/mailers/repository_check_mailer_spec.rb
View file @
b0046bf1
...
...
@@ -12,6 +12,16 @@ describe RepositoryCheckMailer do
expect
(
mail
).
to
deliver_to
admins
.
map
(
&
:email
)
end
it
'omits blocked admins'
do
blocked
=
create
(
:admin
,
:blocked
)
admins
=
create_list
(
:admin
,
3
)
mail
=
described_class
.
notify
(
1
)
expect
(
mail
.
to
).
not_to
include
(
blocked
.
email
)
expect
(
mail
).
to
deliver_to
admins
.
map
(
&
:email
)
end
it
'mentions the number of failed checks'
do
mail
=
described_class
.
notify
(
3
)
...
...
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