Merge remote-tracking branch 'upstream/master'

# Conflicts: # app/AppKernel.php
ezecosystem · Apr 11, 2017 · daac68f · daac68f
2 parents 70ae29e + d76527f
commit daac68f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -36,6 +36,7 @@ public function registerBundles()
             new eZ\Bundle\EzPublishCoreBundle\EzPublishCoreBundle(),
             new eZ\Bundle\EzPublishLegacySearchEngineBundle\EzPublishLegacySearchEngineBundle(),
             new eZ\Bundle\EzPublishIOBundle\EzPublishIOBundle(),
+            new EzSystems\MultiFileUploadBundle\EzSystemsMultiFileUploadBundle(),
             new eZ\Bundle\EzPublishRestBundle\EzPublishRestBundle(),
             new EzSystems\CommentsBundle\EzSystemsCommentsBundle(),
             new EzSystems\LandingPageFieldTypeBundle\EzSystemsLandingPageFieldTypeBundle(),
@@ -64,7 +65,6 @@ public function registerBundles()
             new EzSystems\PersonalizedBlockBundle\EzSystemsPersonalizedBlockBundle(),
             new Lolautruche\EzCoreExtraBundle\EzCoreExtraBundle(),
             new Netgen\TagsBundle\NetgenTagsBundle(),
-            new EzSystems\MultiFileUploadBundle\EzSystemsMultiFileUploadBundle(),
             new AppBundle\AppBundle(),
         );
 

diff --git a/app/config/security.yml b/app/config/security.yml
@@ -10,6 +10,9 @@ security:
             pattern: ^/(_(profiler|wdt)|css|images|js)/
             security: false
 
+        ## WARNING
+        ## Until https://jira.ez.no/browse/EZP-22192 is implemented,
+        ## enabling basic auth in REST will prevent PlatformUI from working
 #        ezpublish_rest:
 #            pattern: ^/api/ezp/v2
 #            stateless: true