Iteration 1 - Readd school merging#391
Open
kienthuynh wants to merge 28 commits intobeautyjoy:mainfrom
Open
Conversation
Implement school merging
making personal website a required field + tests
Revert "Implement school merging"
Update member1 details in info.yml
Sync fork and golden repo: Update nokigiri
This reverts commit 567e3e7.
Contributor
Author
Contributor
Author
|
Updated two rspec tests in merge_controller_spec to pass when integrated with the redirect feature in iteration 3, so it will fail for now. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
This PR reverts another revert that I made since I messed up the git history by merging two features at once. A lot of the commits and file changes are from the "personal_website" feature that hasn't been merged into golden repo yet.
This pull request implements the feature for admins to manually merge two schools, similar to how they can merge two teachers.
Include screenshots, videos, etc.
Who authored this PR?
Kien Huynh
How should this PR be tested?
Note: this PR may seem long but nearly all logic and views are copied over from the teacher merging feature.
Feature is deployed to Heroku to test.