Skip to content

Upgrade to Sinatra 1.4.6#4168

Merged
joshlory merged 1 commit into
stagingfrom
upgrade-sinatra-gem
Oct 1, 2015
Merged

Upgrade to Sinatra 1.4.6#4168
joshlory merged 1 commit into
stagingfrom
upgrade-sinatra-gem

Conversation

@joshlory

Copy link
Copy Markdown
Contributor

No description provided.

@wjordan

wjordan commented Sep 30, 2015

Copy link
Copy Markdown
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?)

@joshlory

joshlory commented Oct 1, 2015

Copy link
Copy Markdown
Contributor Author

Yep! Test runs both of these, and I ran them locally as well.

joshlory pushed a commit that referenced this pull request Oct 1, 2015
@joshlory joshlory merged commit ced66bf into staging Oct 1, 2015
@joshlory joshlory deleted the upgrade-sinatra-gem branch October 1, 2015 20:26
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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants