All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 1d2fe9a2 authored by Leigh B. Stoller's avatar Leigh B. Stoller

More tweaking; make sure the message indicates whoe made the comment.

parent d9630fde
......@@ -63,7 +63,7 @@ sub fatal($$);
sub CheckFlysprayUser($$);
sub CheckFlysprayTaskID($);
sub AddFlysprayComment($$$);
sub FlysprayNotify($$$);
sub FlysprayNotify($$$$);
#
# Parse command arguments. Once we return from getopts, all that should be
......@@ -174,7 +174,7 @@ fatal($EX_SOFTWARE, "Could not add comment to task $fsid")
if (AddFlysprayComment($fsid, $userid, $comment) != 0);
# No errors reported since comment as been added.
FlysprayNotify($fsid, $userid, $comment);
FlysprayNotify($fsid, $user, $userid, $comment);
exit(0);
......@@ -234,9 +234,9 @@ sub AddFlysprayComment($$$)
#
# And send out the notification.
#
sub FlysprayNotify($$$)
sub FlysprayNotify($$$$)
{
my ($fsid, $userid, $comment) = @_;
my ($fsid, $user, $userid, $comment) = @_;
my $assigned_to;
my @email_addresses = ();
......@@ -294,7 +294,8 @@ sub FlysprayNotify($$$)
}
SENDMAIL(undef,
"$project FS#${fsid} comment added",
$comment, $FLYEMAIL,
"*** $project FS#${fsid} comment added by $user\n\n$comment",
$FLYEMAIL,
"Bcc: " . join(",", @email_addresses));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment