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

Sync Dockerfile.tutor with latest server-vars.yml for Tahoe prod #1388

Merged
merged 1 commit into from
Jan 2, 2024

Conversation

bryanlandia
Copy link

Change description

Sync Dockerfile.tutor with latest server-vars.yml for Tahoe prod
Catching up on some for figures, gradefetcher
Adding new openedx-scorm-xblock to match https://github.com/appsembler/edx-configs/pull/1586

Type of change

  • Bug fix (fixes an issue)
  • New feature (adds functionality)
  • Chore

Related issues

https://appsembler.atlassian.net/browse/ENG-302

Checklists

Development

  • Lint rules pass locally
  • Application changes have been tested thoroughly
  • Automated tests covering modified code pass

Security

  • Security impact of change has been considered
  • Code follows company security practices and guidelines

Code review

  • Pull request has a descriptive title and context useful to a reviewer. Screenshots or screencasts are attached as necessary
  • "Ready for review" label attached and reviewers assigned
  • Changes have been reviewed by at least one other contributor
  • Pull request linked to task tracker where applicable

Copy link

github-actions bot commented Jan 2, 2024

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 318
Current conflicts 318
Summary Good work! No added conflicts.

@bryanlandia bryanlandia marked this pull request as ready for review January 2, 2024 04:23
@bryanlandia bryanlandia merged commit 8ee7fb4 into main Jan 2, 2024
11 checks passed
@bryanlandia bryanlandia deleted the chore/dockerfile-sync-configs branch January 2, 2024 18:35
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.

2 participants