Skip to content

Commit cdaec92

Browse files
authored
Merge pull request #1768 from magento/2.0-develop
Update 2.1-develop from 2.0-develop
2 parents abd6fbf + d3555ea commit cdaec92

File tree

4 files changed

+2
-194
lines changed

4 files changed

+2
-194
lines changed

AdobeStockImage/Model/Storage/Delete.php

Lines changed: 0 additions & 60 deletions
This file was deleted.

AdobeStockImage/Test/Unit/Model/Storage/DeleteTest.php

Lines changed: 0 additions & 132 deletions
This file was deleted.

AdobeStockImage/composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
"magento/module-adobe-stock-asset-api": "*",
99
"magento/module-adobe-stock-image-api": "*",
1010
"magento/module-media-gallery-api": "*",
11-
"magento/module-media-gallery-synchronization-api": "*",
12-
"magento/module-cms": "*"
11+
"magento/module-media-gallery-synchronization-api": "*"
1312
},
1413
"suggest": {
1514
"magento/module-catalog": "*"

AdobeStockImageAdminUi/etc/csp_whitelist.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<policy id="img-src">
1212
<values>
1313
<value id="adobe_stock_cdn" type="host">*.ftcdn.net</value>
14+
<value id="adobe_stock_profile_image" type="host">*.behance.net</value>
1415
<value id="jquery_image_load_placeholder" type="host">data:</value>
1516
</values>
1617
</policy>

0 commit comments

Comments
 (0)