From 0c5c9bbc0533844b14a6052c61f8d4f109345067 Mon Sep 17 00:00:00 2001 From: Matthew Grasmick Date: Wed, 31 Aug 2016 08:49:43 -0400 Subject: [PATCH 1/2] Ignoring a lightning patch. --- template/composer.json | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/template/composer.json b/template/composer.json index e3e0d0079..6cba4e564 100644 --- a/template/composer.json +++ b/template/composer.json @@ -5,11 +5,15 @@ { "type": "composer", "url": "https://packagist.drupal-composer.org" + }, + { + "type": "vcs", + "url": "https://github.com/mortenson/composer-patches" } ], "require": { "composer/installers": "^1.0.20", - "cweagans/composer-patches": "^1.5.0", + "cweagans/composer-patches": "master as 1.5.0", "drupal/acquia_connector": "8.1.*", "drupal/acsf": "~8.1", "drupal/core": "~8", @@ -18,7 +22,8 @@ "drupal/security_review" : "8.*", "roave/security-advisories": "dev-master", "drupal-composer/drupal-security-advisories": "8.0.x-dev", - "drupal/lightning": "8.1.x-dev" + "drupal/lightning": "8.1.03", + "drupal/metatag": "8.1.0-beta9" }, "require-dev": { "behat/behat": "3.0.*", @@ -53,6 +58,18 @@ "drupal/core": { "Ignore front end vendor folders to improve directory search performance": "https://www.drupal.org/files/issues/ignore_front_end_vendor-2329453-116.patch" } + }, + "patches-ignore": { + "drupal/lightning": { + "drupal/panels": { + "Bandaid patch breaking save after previewing blocks with Panelizer": + "https://www.drupal.org/files/issues/bandaid.patch" + }, + "drupal/metatag": { + "Patch already committed to metatag 8.1.0-beta10": + "https://www.drupal.org/files/issues/2765137-2.patch" + } + } } }, "scripts": { From a5fe6c82509835ce9aab47b7fc7ba69818a4e853 Mon Sep 17 00:00:00 2001 From: Matthew Grasmick Date: Wed, 31 Aug 2016 09:55:37 -0400 Subject: [PATCH 2/2] Reverting to metatag beta9. --- template/composer.json | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/template/composer.json b/template/composer.json index 6cba4e564..b13636587 100644 --- a/template/composer.json +++ b/template/composer.json @@ -5,15 +5,11 @@ { "type": "composer", "url": "https://packagist.drupal-composer.org" - }, - { - "type": "vcs", - "url": "https://github.com/mortenson/composer-patches" } ], "require": { "composer/installers": "^1.0.20", - "cweagans/composer-patches": "master as 1.5.0", + "cweagans/composer-patches": "^1.5.0", "drupal/acquia_connector": "8.1.*", "drupal/acsf": "~8.1", "drupal/core": "~8", @@ -58,18 +54,6 @@ "drupal/core": { "Ignore front end vendor folders to improve directory search performance": "https://www.drupal.org/files/issues/ignore_front_end_vendor-2329453-116.patch" } - }, - "patches-ignore": { - "drupal/lightning": { - "drupal/panels": { - "Bandaid patch breaking save after previewing blocks with Panelizer": - "https://www.drupal.org/files/issues/bandaid.patch" - }, - "drupal/metatag": { - "Patch already committed to metatag 8.1.0-beta10": - "https://www.drupal.org/files/issues/2765137-2.patch" - } - } } }, "scripts": {