Merge pull request #76 from spryker-shop/202001.1-release

202001.0-p1 release
spryker-shop · Feb 3, 2020 · 4a8ce4d · 4a8ce4d
2 parents 5f71ac3 + fecc742
commit 4a8ce4d
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 17 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -4,12 +4,17 @@ node_modules
 /vendor
 /data
 !/data/import
+!/data/translation
 .git*
 .unison*
+.docker-sync
 /.nvmrc
 /.scrutinizer.yml
 /.travis.yml
 /newrelic.ini
 
 /docker
 !/docker/deployment/
+
+src/Orm/Propel/*/Schema
+src/Generated
diff --git a/config/Shared/config_default-docker.php b/config/Shared/config_default-docker.php
@@ -13,7 +13,6 @@
 use Spryker\Shared\Cms\CmsConstants;
 use Spryker\Shared\CmsGui\CmsGuiConstants;
 use Spryker\Shared\Collector\CollectorConstants;
-use Spryker\Shared\Config\ConfigConstants;
 use Spryker\Shared\Customer\CustomerConstants;
 use Spryker\Shared\DocumentationGeneratorRestApi\DocumentationGeneratorRestApiConstants;
 use Spryker\Shared\DummyPayment\DummyPaymentConfig;
@@ -72,6 +71,7 @@
 use SprykerEco\Shared\Loggly\LogglyConstants;
 use SprykerShop\Shared\CalculationPage\CalculationPageConstants;
 use SprykerShop\Shared\ErrorPage\ErrorPageConstants;
+use SprykerShop\Shared\WebProfilerWidget\WebProfilerWidgetConstants;
 use Twig\Cache\FilesystemCache;
 
 $CURRENT_STORE = Store::getInstance()->getStoreName();
@@ -162,9 +162,10 @@
 $config[ApplicationConstants::ENABLE_WEB_PROFILER] = false;
 $config[KernelConstants::STORE_PREFIX] = 'DEV';
 $config[ApplicationConstants::ENABLE_APPLICATION_DEBUG] = true;
-$config[WebProfilerConstants::ENABLE_WEB_PROFILER]
-    = $config[ConfigConstants::ENABLE_WEB_PROFILER]
-    = true;
+
+$config[WebProfilerConstants::IS_WEB_PROFILER_ENABLED]
+    = $config[WebProfilerWidgetConstants::IS_WEB_PROFILER_ENABLED]
+    = getenv('SPRYKER_DEBUG_ENABLED') && !getenv('SPRYKER_TESTING_ENABLED');
 
 $ENVIRONMENT_PREFIX = '';
 $config[SequenceNumberConstants::ENVIRONMENT_PREFIX] = $ENVIRONMENT_PREFIX;
@@ -232,7 +233,7 @@
         'type' => 'allow',
     ],
     [
-        'bundle' => 'healthCheck',
+        'bundle' => 'health-check',
         'controller' => 'index',
         'action' => 'index',
         'type' => 'allow',
@@ -259,7 +260,7 @@
         'type' => 'allow',
     ],
     [
-        'bundle' => 'healthCheck',
+        'bundle' => 'health-check',
         'controller' => 'index',
         'action' => 'index',
         'type' => 'allow',
@@ -677,7 +678,5 @@
 $config[DocumentationGeneratorRestApiConstants::ENABLE_REST_API_DOCUMENTATION_GENERATION] = true;
 
 // ----------- HTTP Security
-$config[KernelConstants::DOMAIN_WHITELIST] = [
-    $config[ApplicationConstants::HOST_YVES],
-    $config[ApplicationConstants::HOST_ZED],
-];
+$config[KernelConstants::STRICT_DOMAIN_REDIRECT] = false;
+$config[KernelConstants::DOMAIN_WHITELIST] = [];
diff --git a/config/Shared/config_default.php b/config/Shared/config_default.php
@@ -152,7 +152,7 @@
         'type' => 'allow',
     ],
     [
-        'bundle' => 'healthCheck',
+        'bundle' => 'health-check',
         'controller' => 'index',
         'action' => 'index',
         'type' => 'allow',
@@ -179,7 +179,7 @@
         'type' => 'allow',
     ],
     [
-        'bundle' => 'healthCheck',
+        'bundle' => 'health-check',
         'controller' => 'index',
         'action' => 'index',
         'type' => 'allow',

diff --git a/config/install/docker.yml b/config/install/docker.yml
@@ -37,6 +37,9 @@ sections:
             command: "vendor/bin/console translator:generate-cache"
 
     build-development:
+        generate-transfers:
+            command: "vendor/bin/console transfer:generate"
+
         generate-transfer-databuilders:
             command: "vendor/bin/console transfer:databuilder:generate"
 

diff --git a/config/install/testing.yml b/config/install/testing.yml
@@ -112,9 +112,6 @@ sections:
         update-product-labels:
             command: "vendor/bin/console product-label:relations:update"
 
-    fixtures:
-        fixtures:
-            command: 'vendor/bin/console code:fixtures'
 
     queue:
         run-worker:

diff --git a/src/Pyz/Yves/ShopUi/Theme/default/styles/basics/_typography.scss b/src/Pyz/Yves/ShopUi/Theme/default/styles/basics/_typography.scss
@@ -1,5 +1,5 @@
-$font-calibre-url: 'https://s3.eu-central-1.amazonaws.com/spryker/fonts/calibre/';
-$font-circular-url: 'https://s3.eu-central-1.amazonaws.com/spryker/fonts/circular-pro/';
+$font-calibre-url: '../fonts/';
+$font-circular-url: '../fonts/';
 $font-calibre-light: '#{$font-calibre-url}CalibreWeb-Light';
 $font-calibre-regular: '#{$font-calibre-url}CalibreWeb-Regular';
 $font-calibre-medium: '#{$font-calibre-url}CalibreWeb-Medium';