Skip to content

Commit c10abf0

Browse files
ishakhsuvarovishakhsuvarov
committed
#10521: Merge branch 'develop' of github.com:magento/magento2 into use-json-content-type-header-for-ajax-responses
2 parents d0b85b3 + 5973d67 commit c10abf0

File tree

5,212 files changed

+14674
-14307
lines changed

Some content is hidden

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

5,212 files changed

+14674
-14307
lines changed

‎.github/.htaccess

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Order deny,allow
2+
Deny from all

‎CODE_OF_CONDUCT.md renamed to ‎.github/CODE_OF_CONDUCT.md

‎CONTRIBUTING.md renamed to ‎.github/CONTRIBUTING.md

‎ISSUE_TEMPLATE.md renamed to ‎.github/ISSUE_TEMPLATE.md

‎PULL_REQUEST_TEMPLATE.md renamed to ‎.github/PULL_REQUEST_TEMPLATE.md

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
/.metadata
44
/.project
55
/.settings
6+
/.vscode
67
atlassian*
78
/nbproject
89
/robots.txt

‎.htaccess

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -234,10 +234,6 @@
234234
order allow,deny
235235
deny from all
236236
</Files>
237-
<Files CONTRIBUTING.md>
238-
order allow,deny
239-
deny from all
240-
</Files>
241237
<Files COPYING.txt>
242238
order allow,deny
243239
deny from all

‎.htaccess.sample

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,10 +210,6 @@
210210
order allow,deny
211211
deny from all
212212
</Files>
213-
<Files CONTRIBUTING.md>
214-
order allow,deny
215-
deny from all
216-
</Files>
217213
<Files COPYING.txt>
218214
order allow,deny
219215
deny from all

‎.travis.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ env:
2929
- TEST_SUITE=integration INTEGRATION_INDEX=1
3030
- TEST_SUITE=integration INTEGRATION_INDEX=2
3131
- TEST_SUITE=integration INTEGRATION_INDEX=3
32-
- TEST_SUITE=functional ACCEPTANCE_INDEX=1
33-
- TEST_SUITE=functional ACCEPTANCE_INDEX=2
32+
- TEST_SUITE=functional
3433
matrix:
3534
exclude:
3635
- php: 7.0
@@ -40,9 +39,7 @@ matrix:
4039
- php: 7.0
4140
env: TEST_SUITE=js GRUNT_COMMAND=static
4241
- php: 7.0
43-
env: TEST_SUITE=functional ACCEPTANCE_INDEX=1
44-
- php: 7.0
45-
env: TEST_SUITE=functional ACCEPTANCE_INDEX=2
42+
env: TEST_SUITE=functional
4643
cache:
4744
apt: true
4845
directories:
@@ -51,7 +48,7 @@ cache:
5148
- $HOME/node_modules
5249
- $HOME/yarn.lock
5350
before_install: ./dev/travis/before_install.sh
54-
install: composer install --no-interaction --prefer-dist
51+
install: composer install --no-interaction
5552
before_script: ./dev/travis/before_script.sh
5653
script:
5754
# Set arguments for variants of phpunit based tests; '|| true' prevents failing script when leading test fails

‎app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88

99
namespace Magento\AdminNotification\Block\Grid\Renderer;
1010

11-
/**
12-
* Class \Magento\AdminNotification\Block\Grid\Renderer\Actions
13-
*
14-
*/
1511
class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
1612
{
1713
/**

0 commit comments

Comments
 (0)