Skip to content

Commit 307c045

Browse files
author
Roman Liukshyn
committed
Merge remote-tracking branch 'main/develop' into MTA-561
Conflicts: dev/tests/functional/tests/app/Magento/Dhl/Test/Repository/ConfigData.xml dev/tests/functional/tests/app/Magento/Directory/Test/Repository/ConfigData.xml dev/tests/functional/tests/app/Magento/Fedex/Test/Repository/ConfigData.xml dev/tests/functional/tests/app/Magento/Shipping/Test/Repository/ConfigData.xml dev/tests/functional/tests/app/Magento/Ups/Test/Repository/ConfigData.xml dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml
2 parents e28f0f6 + 404e40a commit 307c045

File tree

11,785 files changed

+464633
-420322
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

11,785 files changed

+464633
-420322
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ atlassian*
2020
/lib/internal/flex/varien/.project
2121
/lib/internal/flex/varien/.settings
2222
/node_modules
23+
/.grunt
2324

2425
/pub/media/*.*
2526
!/pub/media/.htaccess

‎.htaccess

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
############################################
2+
## uncomment the line below to enable developer mode
3+
4+
# SetEnv MAGE_MODE developer
5+
16
############################################
27
## uncomment these lines for CGI mode
38
## make sure to specify the correct cgi php binary file name
@@ -167,15 +172,11 @@
167172
## http://developer.yahoo.com/performance/rules.html#expires
168173

169174
ExpiresDefault "access plus 1 year"
175+
ExpiresByType text/html A0
176+
ExpiresByType text/plain A0
170177

171178
</IfModule>
172179

173-
############################################
174-
## By default allow all access
175-
176-
Order allow,deny
177-
Allow from all
178-
179180
###########################################
180181
## Deny access to release notes to prevent disclosure of the installed Magento version
181182

‎.htaccess.sample

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
############################################
2+
## uncomment the line below to enable developer mode
3+
4+
# SetEnv MAGE_MODE developer
5+
16
############################################
27
## uncomment these lines for CGI mode
38
## make sure to specify the correct cgi php binary file name
@@ -164,15 +169,11 @@
164169
## http://developer.yahoo.com/performance/rules.html#expires
165170

166171
ExpiresDefault "access plus 1 year"
172+
ExpiresByType text/html A0
173+
ExpiresByType text/plain A0
167174

168175
</IfModule>
169176

170-
############################################
171-
## By default allow all access
172-
173-
Order allow,deny
174-
Allow from all
175-
176177
###########################################
177178
## Deny access to release notes to prevent disclosure of the installed Magento version
178179

‎.php_cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ $finder = Symfony\CS\Finder\DefaultFinder::create()
1515
->exclude('dev/tests/functional/vendor')
1616
->exclude('dev/tests/integration/tmp')
1717
->exclude('dev/tests/integration/var')
18-
->exclude('lib/internal/Apache')
1918
->exclude('lib/internal/CardinalCommerce')
2019
->exclude('lib/internal/Cm')
2120
->exclude('lib/internal/Credis')

‎.travis.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
language: php
22
php:
3-
- 5.4
43
- 5.5
54
- 5.6
65
env:
@@ -11,10 +10,6 @@ env:
1110
- TEST_SUITE=static_annotation
1211
matrix:
1312
exclude:
14-
- php: 5.4
15-
env: TEST_SUITE=static_phpcs
16-
- php: 5.4
17-
env: TEST_SUITE=static_annotation
1813
- php: 5.6
1914
env: TEST_SUITE=static_phpcs
2015
- php: 5.6

‎CHANGELOG.md

Lines changed: 370 additions & 26 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)