Closed bryanlandia closed 1 year ago
Checking git merge conflicts against https://github.com/edx/edx-platform.git
Comparing with | open-release/nutmeg.master |
---|---|
Benchmark conflicts with main |
299 |
Current conflicts | 299 |
Summary | Good work! No added conflicts. |
Comparing with | master |
---|---|
Benchmark conflicts with main |
316 |
Current conflicts | 316 |
Summary | Good work! No added conflicts. |
Checking git merge conflicts against https://github.com/edx/edx-platform.git
Comparing with | open-release/nutmeg.master |
---|---|
Benchmark conflicts with main |
299 |
Current conflicts | 299 |
Summary | Good work! No added conflicts. |
Comparing with | master |
---|---|
Benchmark conflicts with main |
316 |
Current conflicts | 316 |
Summary | Good work! No added conflicts. |
Checking git merge conflicts against https://github.com/edx/edx-platform.git
Comparing with | open-release/nutmeg.master |
---|---|
Benchmark conflicts with main |
299 |
Current conflicts | 299 |
Summary | Good work! No added conflicts. |
Comparing with | master |
---|---|
Benchmark conflicts with main |
316 |
Current conflicts | 316 |
Summary | Good work! No added conflicts. |
Checking git merge conflicts against https://github.com/edx/edx-platform.git
Comparing with | open-release/nutmeg.master |
---|---|
Benchmark conflicts with main |
299 |
Current conflicts | 299 |
Summary | Good work! No added conflicts. |
Comparing with | master |
---|---|
Benchmark conflicts with main |
316 |
Current conflicts | 316 |
Summary | Good work! No added conflicts. |
Change description
Retry setting window.onYouTubeIframeAPIReady.resolve to JQuery Deferred obj .resolve up to 3 times before finally failing Log err message to console Catch and retry only TypeErrors which should result from .resolve TypeError
This is direclty in edx-platform since I couldn't figure out how to override in the theme due to the webpack bundling that is done directly into VideoBlockPreview.js via add_webpack_to_fragment in video_module.py
Type of change
Related issues
https://appsembler.atlassian.net/browse/ENG-97
Checklists
Development
Security
Code review