#11250: Merge branch '2.2-develop' of github.com:magento/magento2 into fix_admin-search-menu

Author: ishakhsuvarov

.gitignore

@@ -3,6 +3,7 @@
 /.metadata
 /.project
 /.settings
+/.vscode
 atlassian*
 /nbproject
 /robots.txt

.travis.yml

@@ -29,8 +29,7 @@ env:
     - TEST_SUITE=integration INTEGRATION_INDEX=1
     - TEST_SUITE=integration INTEGRATION_INDEX=2
     - TEST_SUITE=integration INTEGRATION_INDEX=3
-    - TEST_SUITE=functional ACCEPTANCE_INDEX=1
-    - TEST_SUITE=functional ACCEPTANCE_INDEX=2
+    - TEST_SUITE=functional
 matrix:
   exclude:
     - php: 7.0
@@ -40,9 +39,7 @@ matrix:
     - php: 7.0
       env: TEST_SUITE=js GRUNT_COMMAND=static
     - php: 7.0
-      env: TEST_SUITE=functional ACCEPTANCE_INDEX=1
-    - php: 7.0
-      env: TEST_SUITE=functional ACCEPTANCE_INDEX=2
+      env: TEST_SUITE=functional
 cache:
   apt: true
   directories:
@@ -55,7 +52,6 @@ install: composer install --no-interaction --prefer-dist
 before_script: ./dev/travis/before_script.sh
 script:
   # Set arguments for variants of phpunit based tests; '|| true' prevents failing script when leading test fails
-  - test $TEST_SUITE = "static" && TEST_FILTER='--filter "Magento\\Test\\Php\\LiveCodeTest"' || true
   - test $TEST_SUITE = "functional" && TEST_FILTER='dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php' || true
 
   # The scripts for grunt/phpunit type tests

app/code/Magento/AdminNotification/composer.json

@@ -11,7 +11,7 @@
         "lib-libxml": "*"
     },
     "type": "magento2-module",
-    "version": "100.2.0-dev",
+    "version": "100.2.0",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/AdminNotification/view/adminhtml/layout/adminhtml_notification_block.xml

@@ -20,14 +20,14 @@
                     <arguments>
                         <argument name="filter_visibility" xsi:type="string">0</argument>
                     </arguments>
-                    <block class="Magento\Backend\Block\Widget\Grid\Column" as="severity">
+                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.notification.container.grid.columnSet.severity" as="severity">
                         <arguments>
                             <argument name="header" xsi:type="string" translate="true">Severity</argument>
                             <argument name="index" xsi:type="string">severity</argument>
                             <argument name="renderer" xsi:type="string">Magento\AdminNotification\Block\Grid\Renderer\Severity</argument>
                         </arguments>
                     </block>
-                    <block class="Magento\Backend\Block\Widget\Grid\Column" as="date_added">
+                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.notification.container.grid.columnSet.date_added" as="date_added">
                         <arguments>
                             <argument name="header" xsi:type="string" translate="true">Date Added</argument>
                             <argument name="id" xsi:type="string">date_added</argument>
@@ -37,14 +37,14 @@
                             <argument name="header_css_class" xsi:type="string">col-date</argument>
                         </arguments>
                     </block>
-                    <block class="Magento\Backend\Block\Widget\Grid\Column" as="title">
+                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.notification.container.grid.columnSet.title" as="title">
                         <arguments>
                             <argument name="header" xsi:type="string" translate="true">Message</argument>
                             <argument name="index" xsi:type="string">title</argument>
                             <argument name="renderer" xsi:type="string">Magento\AdminNotification\Block\Grid\Renderer\Notice</argument>
                         </arguments>
                     </block>
-                    <block class="Magento\Backend\Block\Widget\Grid\Column" as="actions">
+                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="adminhtml.notification.container.grid.columnSet.actions" as="actions">
                         <arguments>
                             <argument name="header" xsi:type="string" translate="true">Actions</argument>
                             <argument name="sortable" xsi:type="string">0</argument>