Rails 4 2 update (extra fixes #2)#3877
Merged
Merged
Conversation
wjordan
added a commit
that referenced
this pull request
Sep 4, 2015
Rails 4 2 update (extra fixes #2)
deploy-code-org
added a commit
that referenced
this pull request
Sep 4, 2015
commit fe06578 Merge: 4e0de33 fe7e738 Author: Brad Buchanan <bradley.c.buchanan@gmail.com> Date: Fri Sep 4 13:02:13 2015 -0700 Merge pull request #3838 from code-dot-org/netsim-visualization-reset Consult UUIDs when deciding to destroy vizelements. commit fe7e738 Author: Brad Buchanan <brad@code.org> Date: Fri Sep 4 12:38:39 2015 -0700 Better comments. commit 4e0de33 Merge: 24ae4ae 1c955c3 Author: Will Jordan <wjordan@users.noreply.github.com> Date: Fri Sep 4 12:25:55 2015 -0700 Merge pull request #3877 from code-dot-org/rails_4_2_update Rails 4 2 update (extra fixes #2) commit 1c955c3 Author: Will Jordan <will@code.org> Date: Fri Sep 4 12:21:28 2015 -0700 load i18n locales before application fork commit 24ae4ae Merge: 8a999a3 6f3e0a7 Author: Andre Stackhouse <CaptainStack@outlook.com> Date: Fri Sep 4 12:12:26 2015 -0700 Merge pull request #3876 from code-dot-org/automated-workshop-email-reminder-prerequisites Much simpler prerequisite calculation (not using activity_constants)
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
1 participant
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.
Extra fixes for Rails 4.2 update (#3866):
httpartyfor ui test runner. This is required because the updatedeyes_seleniumgem no longer includeshttpartyas a dependency, so we now need to include it ourselves.