Merge branch 'EIC/challenge/v1.64.0-v1.01.1-HF' into develop

EIC-EA · Jan 21, 2021 · cf11219 · cf11219
2 parents 50ccec0 + e764d59
commit cf11219
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 716 deletions.
diff --git a/composer.json b/composer.json
@@ -256,7 +256,8 @@
                 "Make it easier to trigger a tour @see https://www.drupal.org/project/drupal/issues/3012027": "https://www.drupal.org/files/issues/2018-11-07/3012027-2.patch",
                 "EntityConstraintValidationList::findByCode is inconsistent @see https://www.drupal.org/project/drupal/issues/3126654": "https://www.drupal.org/files/issues/2020-04-10/find_by_code_override-3126654-D8-4.patch",
                 "Cannot implement a custom user cancellation method @see https://www.drupal.org/project/drupal/issues/3135592": "https://www.drupal.org/files/issues/2020-05-11/3135592-3.patch",
-                "Allow to refine by bundle in EntityConverter @see https://www.drupal.org/project/drupal/issues/3155568": "https://www.drupal.org/files/issues/2020-06-30/3155568-4.patch"
+                "Allow to refine by bundle in EntityConverter @see https://www.drupal.org/project/drupal/issues/3155568": "https://www.drupal.org/files/issues/2020-06-30/3155568-4.patch",
+                "Basic Auth module conflicts with webserver-level 'Site Lock' / basic authentication implementations @see https://www.drupal.org/project/drupal/issues/2842858" : "https://www.drupal.org/files/issues/basic_auth_0.patch"
             },
             "drupal/drupal-extension": {
               "Add space arround the keywords to avoid wrongly matching @see https://github.com/jhedstrom/drupalextension/pull/561": "https://patch-diff.githubusercontent.com/raw/jhedstrom/drupalextension/pull/561.patch"