Upgrade to Sinatra 1.4.6#4168
Merged
Merged
Conversation
Contributor
|
👍 LGTM, patch-level update should have no breaking changes. just make sure that we at least run our pegasus/shared tests on this new version (is that done in test environment?) |
Contributor
Author
|
Yep! Test runs both of these, and I ran them locally as well. |
deploy-code-org
added a commit
that referenced
this pull request
Oct 1, 2015
commit c719e1c Merge: 390f56f 6a7f3e5 Author: Continuous Integration <dev@code.org> Date: Thu Oct 1 20:30:59 2015 +0000 Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging commit 390f56f Author: Continuous Integration <dev@code.org> Date: Thu Oct 1 20:27:30 2015 +0000 content changes (-asher) commit 6a7f3e5 Merge: ced66bf 2b3e863 Author: Josh Lory <josh.lory@code.org> Date: Thu Oct 1 13:27:29 2015 -0700 Merge pull request #4266 from code-dot-org/teacher-view-no-save Don't save projects when in readonlyWorkspace mode (e.g. teacher view) commit ced66bf Merge: c104209 b25a025 Author: Josh Lory <josh.lory@code.org> Date: Thu Oct 1 13:26:39 2015 -0700 Merge pull request #4168 from code-dot-org/upgrade-sinatra-gem Upgrade to Sinatra 1.4.6 commit c104209 Author: Continuous Integration <dev@code.org> Date: Thu Oct 1 20:26:04 2015 +0000 Automatically built. commit 1ea5efd Merge: 5702b7b a54054b Author: Brad Buchanan <bradley.c.buchanan@gmail.com> Date: Thu Oct 1 13:13:14 2015 -0700 Merge pull request #4290 from code-dot-org/trashcan-regression Fix trash can fade layering commit a54054b Author: Brad Buchanan <brad@code.org> Date: Thu Oct 1 12:00:23 2015 -0700 Minimum fix for regression.
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
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.
No description provided.