Skip to content

Commit 4b09ffd

Browse files
ishakhsuvarovishakhsuvarov
committed
MAGETWO-71896: Merge branch 'develop' of github.com:magento/magento2 into MAGETWO-71896-PR-10638
2 parents b10dced + 6f25236 commit 4b09ffd

File tree

5,115 files changed

+11605
-13842
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,115 files changed

+11605
-13842
lines changed

‎.travis.yml

Lines changed: 2 additions & 5 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:

‎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
/**

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77
*/
88
namespace Magento\AdminNotification\Block\Grid\Renderer;
99

10-
/**
11-
* Class \Magento\AdminNotification\Block\Grid\Renderer\Notice
12-
*
13-
*/
1410
class Notice extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
1511
{
1612
/**

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

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

1010
use Magento\Framework\Notification\MessageInterface;
1111

12-
/**
13-
* Class \Magento\AdminNotification\Block\Grid\Renderer\Severity
14-
*
15-
*/
1612
class Severity extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
1713
{
1814
/**

‎app/code/Magento/AdminNotification/Block/Inbox.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
/**
1111
* @api
12+
* @since 100.0.2
1213
*/
1314
class Inbox extends \Magento\Backend\Block\Widget\Grid\Container
1415
{

‎app/code/Magento/AdminNotification/Block/System/Messages.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
*/
66
namespace Magento\AdminNotification\Block\System;
77

8-
/**
9-
* Class \Magento\AdminNotification\Block\System\Messages
10-
*
11-
*/
128
class Messages extends \Magento\Backend\Block\Template
139
{
1410
/**

‎app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
/**
1111
* @api
12+
* @since 100.0.2
1213
*/
1314
class UnreadMessagePopup extends \Magento\Backend\Block\Template
1415
{

‎app/code/Magento/AdminNotification/Block/ToolbarEntry.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
*
1212
* @api
1313
* @author Magento Core Team <core@magentocommerce.com>
14+
* @since 100.0.2
1415
*/
1516
class ToolbarEntry extends \Magento\Backend\Block\Template
1617
{

‎app/code/Magento/AdminNotification/Block/Window.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
/**
1111
* @api
12+
* @since 100.0.2
1213
*/
1314
class Window extends \Magento\Backend\Block\Template
1415
{

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
/**
1111
* @api
12+
* @since 100.0.2
1213
*/
1314
abstract class Notification extends \Magento\Backend\App\AbstractAction
1415
{

0 commit comments

Comments
 (0)