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 opencraft-release/palm.1 with Upstream 20240116-1705365859 #618

Conversation

opencraft-requirements-bot

Syncing opencraft-release/palm.1 with Upstream

Important❗

Please always use the "Create a merge commit" option as it avoids issues when checking diffs with upstream.

Note on Conflicts ⚠️

In cases of conflicts you can go ahead and resolve it here on Github if it is simple enough. However if it is a more complicated conflict please follow the steps below:

  1. Check out sync-open-release/palm.master-20240116-1705365859 locally:
  2. Pull latest changes from opencraft-release/palm.1 into that branch, make sure your [REMOTE] is pointing to opencraft-release/palm.1:
git pull [REMOTE] opencraft-release/palm.1
  1. Resolve the conflicts locally, then commit the result. This will create a new merge commit.
  2. Push the new merge commit to sync-open-release/palm.master-20240116-1705365859 to update this PR
  3. Review the PR again and merge when ready!
    Note: Please use the "Create a merge commit" option as it avoids issues when checking diffs with upstream.

Agrendalath and others added 3 commits January 12, 2024 17:29
…allback-jwt-restricted-application-check-palm

fix(palm): add `JwtRestrictedApplication` check to XBlock callback
@Agrendalath Agrendalath merged commit 4f73576 into opencraft-release/palm.1 Jan 16, 2024
41 checks passed
@Agrendalath Agrendalath deleted the sync-open-release/palm.master-20240116-1705365859 branch January 16, 2024 01:11
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.

3 participants