Skip to content
This repository has been archived by the owner on Dec 10, 2021. It is now read-only.

PLAT-207 update core and contrib #223

Merged
merged 20 commits into from
May 10, 2016

Conversation

bimsonz
Copy link
Contributor

@bimsonz bimsonz commented May 9, 2016

@bimsonz bimsonz self-assigned this May 9, 2016
@bimsonz bimsonz assigned Saphyel and unassigned bimsonz May 9, 2016
@bimsonz
Copy link
Contributor Author

bimsonz commented May 9, 2016

@Saphyel This is ready but i want to wait for travis to be fixed to merge this in!

@bimsonz bimsonz changed the title Feature/plat 207 update core and contrib PLAT-207 update core and contrib May 9, 2016
@Saphyel
Copy link
Contributor

Saphyel commented May 9, 2016

@bimsonz Could you also update entity_api & ctools?

@bimsonz
Copy link
Contributor Author

bimsonz commented May 9, 2016

@Saphyel is 2672110: https://www.drupal.org/files/issues/entityfieldderiver-2672110-2.patch still required ?

@bimsonz
Copy link
Contributor Author

bimsonz commented May 9, 2016

@Saphyel Both contrib updated

@Saphyel
Copy link
Contributor

Saphyel commented May 9, 2016

@bimsonz good point we still need them

@pvhee
Copy link
Contributor

pvhee commented May 10, 2016

@bimsonz this is failing on (via Travis) " [error] exception 'Symfony\Component\DependencyInjection\Exception\RuntimeException' with message 'The parent definition "serializer.normalizer.entity_reference_item.hal" defined for definition "serializer.normalizer.entity_reference_revision_item.hal" does not exist.' in /home/travis/build/comicrelief/campaign/vendor/symfony/dependency-injection/Compiler/ResolveDefinitionTemplatesPass.php:100"

@Saphyel
Copy link
Contributor

Saphyel commented May 10, 2016

it's because the lastest patch of entity_reference_revisions
Is suppose to be committed in the last dev...: https://www.drupal.org/node/2598138#comment-11097081

@bimsonz
Copy link
Contributor Author

bimsonz commented May 10, 2016

@pvhee @Saphyel its because Carlos updated a patch we need to one we don't... ERR/ Paragraphs updates need to be reviewed on a more detailed basis before updating.

@pvhee
Copy link
Contributor

pvhee commented May 10, 2016

OK can we fix this pls? as a general rule, let's do core updates in one PR without antyhing else - we can do contrib updates elsewhere

@bimsonz
Copy link
Contributor Author

bimsonz commented May 10, 2016

@pvhee I have fixed. Just waiting for Travis to confirm.

@bimsonz
Copy link
Contributor Author

bimsonz commented May 10, 2016

@Saphyel @pvhee All green and ready to go if you two are both happy with it...

@pvhee pvhee merged commit d76ec4d into develop May 10, 2016
@pvhee pvhee deleted the feature/PLAT-207_update_core_and_contrib branch May 10, 2016 14:16
@pvhee pvhee mentioned this pull request Jan 5, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants