Merge remote-tracking branch 'upstream/master'

ezecosystem · Mar 21, 2018 · 5996228 · 5996228
2 parents a4cdb3d + 71258e9
commit 5996228
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/app/config/routing.yml b/app/config/routing.yml
@@ -13,7 +13,12 @@ kernel.internal:
 
 kernel.rest:
     resource: '@EzPublishRestBundle/Resources/config/routing.yml'
-    prefix: /api/ezp/v2
+    prefix: '%ezpublish_rest.path_prefix%'
+
+kernel.rest.options:
+    resource: '@EzPublishRestBundle/Resources/config/routing.yml'
+    prefix: '%ezpublish_rest.path_prefix%'
+    type: rest_options
 
 ezplatform.admin_ui:
     resource: '@EzPlatformAdminUiBundle/Resources/config/routing.yml'