Responsive Redux followup #19483
Merged
Responsive Redux followup #19483
Conversation
This file contains 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
# Conflicts: # apps/src/sites/studio/pages/congrats/index.js # apps/src/templates/Congrats.jsx
# Conflicts: # apps/src/templates/ContentContainer.jsx # apps/src/templates/studioHomepages/CourseBlocksStudentGradeBands.jsx
# Conflicts: # apps/src/sites/studio/pages/projects/public.js # apps/test/unit/templates/studioHomepages/StudentHomepageTest.js
Merged
joshlory
force-pushed
the
responsive-next-next
branch
2 times, most recently
from
6fc6953
to
0bf3787
Compare
This was referenced Dec 13, 2017
# Conflicts: # apps/src/templates/Certificate.jsx # apps/src/templates/Congrats.jsx # apps/test/unit/templates/CertificateTest.js # apps/test/unit/templates/CongratsTest.js
# Conflicts: # apps/src/templates/Congrats.jsx # dashboard/app/controllers/congrats_controller.rb # dashboard/app/views/congrats/index.html.haml
This was referenced Dec 14, 2017
# Conflicts: # apps/src/templates/Congrats.jsx # apps/src/templates/census2017/YourSchool.jsx # apps/src/templates/studioHomepages/CourseBlocksTools.jsx # apps/src/templates/studioHomepages/Courses.jsx # apps/src/templates/studioHomepages/TeacherHomepage.jsx # apps/src/templates/studioHomepages/TeacherResources.story.jsx # apps/test/unit/templates/CongratsTest.js # apps/test/unit/templates/StudentsBeyondHocTest.js
joshlory
force-pushed
the
responsive-next-next
branch
from
a7b7198
to
c308cac
Compare
|
Ok, this should be ready to review! The remaining diff should just be the removal of |
breville
approved these changes
Dec 16, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 pulls the changes from PR #19117 and PR #19399 into one pull request. I got sick of resolving conflicts on two different branches 😄.
My goal isn't to merge this change immediately, but to use this as a starting point to peel off smaller PRs (reducing the diff in this PR over time).