Merge remote-tracking branch 'upstream/master'

ezpublishlegacy · Nov 1, 2018 · 9f15430 · 9f15430
2 parents fd5cf30 + 7f25906
commit 9f15430
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/app/config/env/generic.php b/app/config/env/generic.php
@@ -71,3 +71,7 @@
 if ($value = getenv('SESSION_HANDLER_ID')) {
     $container->setParameter('ezplatform.session.handler_id', $value);
 }
+
+if ($value = getenv('SESSION_SAVE_PATH')) {
+    $container->setParameter('ezplatform.session.save_path', $value);
+}
diff --git a/composer.json b/composer.json
@@ -35,13 +35,13 @@
         "doctrine/orm": "^2.5",
         "sensio/distribution-bundle": "^5.0.22",
         "incenteev/composer-parameter-handler": "^2.1.3",
-        "ezsystems/ezpublish-kernel": "^7.3@dev",
-        "ezsystems/repository-forms": "^2.3@dev",
+        "ezsystems/ezpublish-kernel": "^7.4@dev",
+        "ezsystems/repository-forms": "^2.4@dev",
         "ezsystems/ezplatform-solr-search-engine": "^1.5@dev",
         "ezsystems/ez-support-tools": "^0.2@dev",
-        "ezsystems/ezplatform-http-cache": "^0.8@dev",
-        "ezsystems/ezplatform-admin-ui": "^1.3@dev",
-        "ezsystems/ezplatform-admin-ui-modules": "^1.3@dev",
+        "ezsystems/ezplatform-http-cache": "^0.9@dev",
+        "ezsystems/ezplatform-admin-ui": "^1.4@dev",
+        "ezsystems/ezplatform-admin-ui-modules": "^1.4@dev",
         "ezsystems/ezplatform-admin-ui-assets": "^3.1@dev",
         "ezsystems/ezplatform-design-engine": "^2.0@dev",
         "ezsystems/ezplatform-standard-design": "^0.1@dev",
@@ -111,7 +111,7 @@
             "file": "app/config/parameters.yml"
         },
         "branch-alias": {
-            "dev-master": "2.3.x-dev"
+            "dev-master": "2.4.x-dev"
         }
     }
 }