Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update 2.1-master from 2.1-develop #1834

Merged
merged 42 commits into from
Sep 16, 2020
Merged

Update 2.1-master from 2.1-develop #1834

merged 42 commits into from
Sep 16, 2020

Conversation

sivaschenko
Copy link
Member

Update 2.1-master from 2.1-develop

sivaschenko and others added 30 commits August 30, 2020 21:53
2.1.0 develop to master synchronization
…ion into 1787-cover-getassetlistinterface-with-integration-test
Locate functionality fix and ACL renaming
…icensing from Media Gallery - closed context menu after unsuccessful licensing
…nt-fit-into-license-asi-message

#1809: Long image name doesn't fit into License "Adobe Stock Images...?" message
[2.1.0-master] Unskipped AdminMediaGalleryPageSavedPreviewAddSelectedTest
Update 2.1-develop from 2.1.0-master
Cover Client\FilesInterface with an integration test
…ion into 1787-cover-getassetlistinterface-with-integration-test
…ion into 1802-context-menu-not-closed-after-unsuccessful-licensing-from-media-gallery
…icensing from Media Gallery - removed changes in licenseActions.js and created mftf test file
…icensing from Media Gallery - updated mftf test files
…icensing from Media Gallery - modified test and section
sivaschenko and others added 9 commits September 12, 2020 19:22
…ace-with-integration-test

Cover GetAssetListInterface with an integration test
…sed-after-unsuccessful-licensing-from-media-gallery

[WIP] #1802: The "three dots" context menu is not closed after unsuccessful licensing from Media Gallery
…ion into 1823-cover-getassetbyidinterface-with-integration-test
…he mock class with existing mock class and modified the sample data for the existing mock class
…ace-with-integration-test

#1823: Cover GetAssetByIdInterface with integration test
…e--task-1786

#1786 :- Replace DocumentToAssetTest unit test with an integration test
@m2-community-project m2-community-project bot added this to Ready for Review in Pull Request Progress Sep 15, 2020
@sivaschenko
Copy link
Member Author

@magento run all tests

@sivaschenko
Copy link
Member Author

@magento run all tests

@sivaschenko
Copy link
Member Author

@magento run all tests

@sivaschenko
Copy link
Member Author

@magento run Functional Tests CE

@sivaschenko
Copy link
Member Author

sivaschenko commented Sep 16, 2020

The test AdminMediaGalleryUploadCategoryImageTest failed for Functional Tests EE build http://10.234.202.209:8080/job/Functional-Tests-EE/1221/ is a known randomly failing test that will be stabilized with the merge of magento/magento2#30042

@sivaschenko sivaschenko merged commit 740340b into 2.1-master Sep 16, 2020
@ghost
Copy link

ghost commented Sep 16, 2020

Hi @sivaschenko, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

@m2-community-project m2-community-project bot moved this from Ready for Review to Done in Pull Request Progress Sep 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

None yet

3 participants