diff --git a/app/src/Talk/TwigExtension/TalksExtension.php b/app/src/Talk/TwigExtension/TalksExtension.php index ce4b36ae..c789e114 100644 --- a/app/src/Talk/TwigExtension/TalksExtension.php +++ b/app/src/Talk/TwigExtension/TalksExtension.php @@ -94,7 +94,7 @@ class TalksExtension extends AbstractExtension { return (new Collection($talk['events'])) ->map(function (array $event) use ($eventData): Collection { - return (new Collection($event))->merge($eventData[$event['event']]); + return (new Collection($eventData[$event['event']]))->merge($event); }) ->filter(function (Collection $event): bool { return !empty($event->get('date')); diff --git a/app/tests/Talk/TwigExtension/RetrievingEventsTest.php b/app/tests/Talk/TwigExtension/RetrievingEventsTest.php index dff83612..96ae6b03 100644 --- a/app/tests/Talk/TwigExtension/RetrievingEventsTest.php +++ b/app/tests/Talk/TwigExtension/RetrievingEventsTest.php @@ -150,4 +150,10 @@ class RetrievingEventsTest extends TestCase $this->assertCount(1, $events); $this->assertSame('drupal_developer_days_2018', $events->pluck('event')->first()); } + + /** @test */ + public function specific_event_urls_override_global_urls() + { + $this->markTestSkipped(); + } } diff --git a/source/_talks/deploying-php-ansible-ansistrano.md b/source/_talks/deploying-php-ansible-ansistrano.md index a1bae122..fee1b7d8 100644 --- a/source/_talks/deploying-php-ansible-ansistrano.md +++ b/source/_talks/deploying-php-ansible-ansistrano.md @@ -16,11 +16,13 @@ events: date: 2019-07-23 - event: drupalcon_eu_19 date: 2019-10-30 + - event: bristol_devops + date: 2020-01-30 + url: https://www.meetup.com/Bristol-Cloud-Native-DevOps/events/266609627 - event: drupal_edinburgh date: 2020-03-12 online: true - - event: bristol_devops - date: 2020-01-30 + url: https://www.meetup.com/Drupal-Edinburgh/events/267905594 --- Great! You’ve built your website, and now you just need to deploy it. There are various ways that this could be done - from (S)FTP, to SCP and rsync, to running commands like `git pull` and `composer install` directly on the server which is not ideal.