Commit dd1b6ef4 authored by Robert Ricci's avatar Robert Ricci

Move where the project_id is found in the webhook

Upstream pulled in a patch to include this, so we no longer need
a local patch to gitlab - yay! However, they put it in a slightly
different place in the webhook data than I did.
parent 6880790c
...@@ -194,7 +194,7 @@ sub run_gitmail($$) { ...@@ -194,7 +194,7 @@ sub run_gitmail($$) {
# NB: This depends on the Utah patch to gitlab that adds the project ID # NB: This depends on the Utah patch to gitlab that adds the project ID
# to the data in the hook # to the data in the hook
# #
my $repoinfo = call_gitlab_api("/projects/" . $data->{"repository"}{"project_id"}); my $repoinfo = call_gitlab_api("/projects/" . $data->{"project_id"});
# #
# Change to the directory where the repo lives - this is the simplest way # Change to the directory where the repo lives - this is the simplest way
...@@ -228,7 +228,7 @@ sub run_gitmail($$) { ...@@ -228,7 +228,7 @@ sub run_gitmail($$) {
# If requested, send mail to everyone who's listed on the project # If requested, send mail to everyone who's listed on the project
if (exists $get_vars->{'mailmembers'} || exists $get_vars->{'noarchive'}) { if (exists $get_vars->{'mailmembers'} || exists $get_vars->{'noarchive'}) {
$options{'alwaysmail'} = $options{'alwaysmail'} =
get_member_addresses($data->{"repository"}{"project_id"}); get_member_addresses($data->{"project_id"});
} }
# gitlab's URL for this project # gitlab's URL for this project
......
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