Uses the same import path for instructor_task.models as edxapp #128
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
👍 once tests are green.
|
|
@bradenmacdonald Do I need any more approvals before merging this PR, and tagging the updated version for the hotfix? |
|
@pomegranited No, one reviewer is fine here. Go ahead and merge. |
Includes version bump to 2.6.1 Fixes RuntimeError: Conflicting 'instructortask' models in application 'instructor_task': <class 'lms.djangoapps.instructor_task.models.InstructorTask'> and <class 'instructor_task.models.InstructorTask'>.
pomegranited
force-pushed
the
jill/fix_instructor_task_path
branch
from
96d7c50 to
1667412
Compare
pomegranited
added a commit
to open-craft/edx-platform
that referenced
this pull request
Nov 8, 2016
2 tasks
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes celery task error (ref TNL-5903):
Testing instructions
master. The commit that introduced the conflict was 54d34e8.Reviewers