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 from main (production) #1360

Merged
merged 4 commits into from
Jul 14, 2023
Merged

Update from main (production) #1360

merged 4 commits into from
Jul 14, 2023

Conversation

github-actions[bot]
Copy link

This is an automated pull request to update from branch main

Fix ENG-183: Studio schedule and details page times out
(setTimeout length testing if YT API is ready)
Another attempt to fix ENG-97
…i-ready-timeout

Increase YouTube TEST_TIMEOUT  to 2.5s
…ils-502

Bugfix: Studio Schedule and Details page times out (ENG-183)
@github-actions
Copy link
Author

Checking git merge conflicts against https://github.com/edx/edx-platform.git

Comparing with open-release/nutmeg.master
Benchmark conflicts with prod 299
Current conflicts 299
Summary Good work! No added conflicts.
Comparing with master
Benchmark conflicts with prod 315
Current conflicts 316
Summary Adds 1 new conflicts. How can we do better?

@bryanlandia bryanlandia merged commit 9422f8b into prod Jul 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant