Skip to content

Commit 3e83f58

Browse files
committed
MTA-4125: Check skipped Create, Update Simple and Virtual Product tests on Jenkins
- merge commit
2 parents f93090d + 941a525 commit 3e83f58

File tree

1,039 files changed

+54271
-10836
lines changed

Some content is hidden

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

1,039 files changed

+54271
-10836
lines changed

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@
55
/.settings
66
atlassian*
77
/nbproject
8+
/robots.txt
9+
/pub/robots.txt
810
/sitemap
911
/sitemap.xml
12+
/pub/sitemap
13+
/pub/sitemap.xml
1014
/.idea
1115
/.gitattributes
1216
/app/config_sandbox
@@ -41,6 +45,7 @@ atlassian*
4145
!/pub/media/customer/.htaccess
4246
/pub/media/downloadable/*
4347
!/pub/media/downloadable/.htaccess
48+
/pub/media/favicon/*
4449
/pub/media/import/*
4550
!/pub/media/import/.htaccess
4651
/pub/media/theme/*

.travis.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ addons:
99
- postfix
1010
language: php
1111
php:
12-
- 5.6.29
1312
- 7.0
1413
env:
1514
global:
@@ -30,12 +29,6 @@ cache:
3029
- $HOME/.nvm
3130
- $HOME/node_modules
3231
- $HOME/yarn.lock
33-
matrix:
34-
exclude:
35-
- php: 5.6.29
36-
env: TEST_SUITE=static
37-
- php: 5.6.29
38-
env: TEST_SUITE=js
3932
before_install: ./dev/travis/before_install.sh
4033
install: composer install --no-interaction --prefer-dist
4134
before_script: ./dev/travis/before_script.sh

COPYING.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
66
Please see LICENSE.txt for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.
77

88
Subject to Licensee's payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file.
9-
Please see <insert file name of the MEE license> for the full text of the MEE License or visit http://magento.com/legal/terms/enterprise.
9+
Please see LICENSE_EE.txt for the full text of the MEE License or visit http://magento.com/legal/terms/enterprise.

README.md

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,33 @@ To suggest documentation improvements, click [here][4].
2727
[3]: <https://github.com/magento/magento2/issues>
2828
[4]: <http://devdocs.magento.com>
2929

30+
<h3>Labels applied by the Magento team</h3>
31+
32+
| Label | Description |
33+
| ------------- |-------------|
34+
| ![DOC](http://devdocs.magento.com/common/images/github_DOC.png) | Affects Documentation domain. |
35+
| ![PROD](http://devdocs.magento.com/common/images/github_PROD.png) | Affects the Product team (mostly feature requests or business logic change). |
36+
| ![TECH](http://devdocs.magento.com/common/images/github_TECH.png) | Affects Architect Group (mostly to make decisions around technology changes). |
37+
| ![accept](http://devdocs.magento.com/common/images/github_accept.png) | The pull request has been accepted and will be merged into mainline code. |
38+
| ![reject](http://devdocs.magento.com/common/images/github_reject.png) | The pull request has been rejected and will not be merged into mainline code. Possible reasons can include but are not limited to: issue has already been fixed in another code contribution, or there is an issue with the code contribution. |
39+
| ![bug report](http://devdocs.magento.com/common/images/github_bug.png) | The Magento Team has confirmed that this issue contains the minimum required information to reproduce. |
40+
| ![acknowledged](http://devdocs.magento.com/common/images/gitHub_acknowledged.png) | The Magento Team has validated the issue and an internal ticket has been created. |
41+
| ![acknowledged](http://devdocs.magento.com/common/images/github_inProgress.png) | The internal ticket is currently in progress, fix is scheduled to be delivered. |
42+
| ![acknowledged](http://devdocs.magento.com/common/images/github_needsUpdate.png) | The Magento Team needs additional information from the reporter to properly prioritize and process the issue or pull request. |
43+
3044
<h2>Reporting security issues</h2>
3145

3246
To report security vulnerabilities in Magento software or web sites, please e-mail <a href="mailto:security@magento.com">security@magento.com</a>. Please do not report security issues using GitHub. Be sure to encrypt your e-mail with our <a href="https://info2.magento.com/rs/magentoenterprise/images/security_at_magento.asc">encryption key</a> if it includes sensitive information. Learn more about reporting security issues <a href="https://magento.com/security/reporting-magento-security-issue">here</a>.
3347

34-
Stay up-to-date on the latest vulnerabilities and patches for Magento by signing up for <a href="https://magento.com/security/sign-up">Security Alert Notifications</a>.
48+
Stay up-to-date on the latest security news and patches for Magento by signing up for <a href="https://magento.com/security/sign-up">Security Alert Notifications</a>.
49+
50+
<h2>License</h2>
51+
52+
Each Magento source file included in this distribution is licensed under OSL 3.0 or the Magento Enterprise Edition (MEE) license
53+
54+
http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
55+
Please see LICENSE.txt for the full text of the OSL 3.0 license or contact license@magentocommerce.com for a copy.
56+
57+
Subject to Licensee's payment of fees and compliance with the terms and conditions of the MEE License, the MEE License supersedes the OSL 3.0 license for each source file.
58+
Please see LICENSE_EE.txt for the full text of the MEE License or visit http://magento.com/legal/terms/enterprise.
3559

app/code/Magento/AdminNotification/view/adminhtml/ui_component/notification_area.xml

Lines changed: 26 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -9,44 +9,35 @@
99
<argument name="data" xsi:type="array">
1010
<item name="js_config" xsi:type="array">
1111
<item name="provider" xsi:type="string">notification_area.notification_area_data_source</item>
12-
<item name="deps" xsi:type="string">notification_area.notification_area_data_source</item>
1312
</item>
14-
<item name="spinner" xsi:type="string">columns</item>
1513
</argument>
16-
<dataSource name="notification_area_data_source">
17-
<argument name="dataProvider" xsi:type="configurableObject">
18-
<argument name="class" xsi:type="string">Magento\AdminNotification\Ui\Component\DataProvider\DataProvider</argument>
19-
<argument name="name" xsi:type="string">notification_area_data_source</argument>
20-
<argument name="primaryFieldName" xsi:type="string">identity</argument>
21-
<argument name="requestFieldName" xsi:type="string">identity</argument>
22-
<argument name="data" xsi:type="array">
23-
<item name="config" xsi:type="array">
24-
<item name="component" xsi:type="string">Magento_Ui/js/grid/provider</item>
25-
<item name="update_url" xsi:type="url" path="mui/index/render"/>
26-
<item name="storageConfig" xsi:type="array">
27-
<item name="indexField" xsi:type="string">identity</item>
28-
</item>
29-
</item>
30-
</argument>
31-
</argument>
14+
<settings>
15+
<spinner>columns</spinner>
16+
<deps>
17+
<dep>notification_area.notification_area_data_source</dep>
18+
</deps>
19+
</settings>
20+
<dataSource name="notification_area_data_source" component="Magento_Ui/js/grid/provider">
21+
<settings>
22+
<storageConfig>
23+
<param name="indexField" xsi:type="string">identity</param>
24+
</storageConfig>
25+
<updateUrl path="mui/index/render"/>
26+
</settings>
27+
<dataProvider class="Magento\AdminNotification\Ui\Component\DataProvider\DataProvider" name="notification_area_data_source">
28+
<settings>
29+
<requestFieldName>identity</requestFieldName>
30+
<primaryFieldName>identity</primaryFieldName>
31+
</settings>
32+
</dataProvider>
3233
</dataSource>
33-
<columns name="columns">
34-
<argument name="data" xsi:type="array">
35-
<item name="config" xsi:type="array">
36-
<item name="component" xsi:type="string">Magento_AdminNotification/js/grid/listing</item>
37-
<item name="template" xsi:type="string">Magento_AdminNotification/grid/listing</item>
38-
</item>
39-
</argument>
40-
<column name="created_at">
41-
<argument name="data" xsi:type="array">
42-
<item name="config" xsi:type="array">
43-
<item name="component" xsi:type="string">Magento_AdminNotification/js/grid/columns/message</item>
44-
<item name="label" xsi:type="string" translate="true"/>
45-
<item name="dataType" xsi:type="string">text</item>
46-
<item name="sorting" xsi:type="string">asc</item>
47-
<item name="sortOrder" xsi:type="number">30</item>
48-
</item>
49-
</argument>
34+
<columns name="columns" component="Magento_AdminNotification/js/grid/listing" template="Magento_AdminNotification/grid/listing">
35+
<column name="created_at" component="Magento_AdminNotification/js/grid/columns/message" sortOrder="30">
36+
<settings>
37+
<dataType>text</dataType>
38+
<label translate="true"/>
39+
<sorting>asc</sorting>
40+
</settings>
5041
</column>
5142
</columns>
5243
</listing>

0 commit comments

Comments
 (0)