Merge remote-tracking branch 'upstream/master'
Conflicts: composer.json
This commit is contained in:
commit
287a2b3632
49 changed files with 600 additions and 1032 deletions
|
|
@ -41,6 +41,11 @@ class GithubController extends \PHPCI\Controller
|
|||
$build->setLog('');
|
||||
$build->setCreated(new \DateTime());
|
||||
$build->setBranch(str_replace('refs/heads/', '', $payload['ref']));
|
||||
|
||||
if (!empty($payload['pusher']['email'])) {
|
||||
$build->setCommitterEmail($payload['pusher']['email']);
|
||||
}
|
||||
|
||||
} catch (\Exception $ex) {
|
||||
header('HTTP/1.1 400 Bad Request');
|
||||
header('Ex: ' . $ex->getMessage());
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue