Merge remote-tracking branch 'remotes/dev/5.1' into 5.1

Author: CI bot

.env-app

@@ -39,9 +39,12 @@ ORO_SESSION_DSN=native:
 ###< session config ###
 
 ###> websocket config ###
-ORO_WEBSOCKET_SERVER_DSN=//0.0.0.0:8080
-ORO_WEBSOCKET_FRONTEND_DSN=//*:8080/ws
-ORO_WEBSOCKET_BACKEND_DSN=tcp://127.0.0.1:8080
+# websocket server DSN example: //0.0.0.0:8080
+ORO_WEBSOCKET_SERVER_DSN=
+# websocket client frontend DSN example: //*:8080/ws
+ORO_WEBSOCKET_FRONTEND_DSN=
+# websocket client backend DSN example: tcp://127.0.0.1:8080
+ORO_WEBSOCKET_BACKEND_DSN=
 ###< websocket config ###
 
 ###> message queue config ###

.env-app.test

@@ -1,3 +1,6 @@
 ORO_DB_URL=postgres://[email protected]/b2b_crm_dev_test
 ORO_DB_DSN=${ORO_DB_URL}
 ORO_MAILER_DSN=smtp://127.0.0.1
+ORO_WEBSOCKET_SERVER_DSN=
+ORO_WEBSOCKET_FRONTEND_DSN=
+ORO_WEBSOCKET_BACKEND_DSN=

.env-build

@@ -1,3 +1,6 @@
+ORO_WEBSOCKET_SERVER_DSN=
+ORO_WEBSOCKET_FRONTEND_DSN=
+ORO_WEBSOCKET_BACKEND_DSN=
 ORO_IMAGE=${ORO_PROJECT}orocommerce-application
 ORO_IMAGE_TEST=${ORO_IMAGE}-test
 ORO_IMAGE_INIT=${ORO_IMAGE}-init

config/config.yml

@@ -6,7 +6,7 @@ imports:
 parameters:
     # Some parameter values are not set from environment variables because Symfony service container build
     # depends on them. These parameter values cannot be changed in runtime without the application cache rebuild.
-    web_backend_prefix: '/admin'
+    
     database_server_version: '13.7'
     secret: '%env(ORO_SECRET)%'
     database_dsn: '%env(ORO_DB_DSN)%'

dev.json

@@ -39,10 +39,7 @@
     "oro/mailchimp": "5.1.x-dev",
     "oro/cookie-consent": "5.1.x-dev",
     "oro/gridfs-config": "5.1.x-dev",
-    "oro/commerce-demo-checkouts": "5.1.x-dev",
-    "oro/commerce-documentation-examples": "5.1.x-dev",
-    "oro/crm-documentation-examples": "5.1.x-dev",
-    "oro/platform-documentation-examples": "5.1.x-dev"
+    "oro/commerce-demo-checkouts": "5.1.x-dev"
   },
   "require-dev": {
     "behat/behat": "~3.12.0",
@@ -137,18 +134,6 @@
       "type": "path",
       "url": "../../package/*"
     },
-    {
-      "type": "path",
-      "url": "../../documentation/code_examples/commerce"
-    },
-    {
-      "type": "path",
-      "url": "../../documentation/code_examples/crm"
-    },
-    {
-      "type": "path",
-      "url": "../../documentation/code_examples/platform"
-    },
     {
       "type": "composer",
       "url": "https://packagist.orocrm.com"