Re-merge "Always expect a channel in project.js"#4911
Merged
Conversation
Contributor
|
lgtm |
Contributor
Author
|
UI test passing via Sauce Connect: |
joshlory
pushed a commit
that referenced
this pull request
Oct 29, 2015
…nnel Re-merge "Always expect a channel in `project.js`"
deploy-code-org
added a commit
that referenced
this pull request
Oct 29, 2015
16bc449 Merge pull request #4903 from code-dot-org/only_setup_local_pegasus_db (philbogle) 7460930 Merge pull request #4911 from code-dot-org/remerge-project-expect-channel (Josh Lory) 4907658 Merge pull request #4915 from code-dot-org/revert-4723-ajax_sign_in (philbogle) c266d62 Revert "Render the sign-in/sign-out button in the Dashboard header using Ajax" (philbogle) 0dc2fb9 Header (and 'Remix' button) doesn't show up on mobile [ci skip] (Josh Lory) 7317599 Merge pull request #4913 from code-dot-org/all-responses (Laurel) 9ac35c2 Merge pull request #4723 from code-dot-org/ajax_sign_in (philbogle)
deploy-code-org
added a commit
that referenced
this pull request
Oct 29, 2015
224dc67 Merge pull request #4786 from code-dot-org/pulse-item (Brad Buchanan) d619792 Automatically built. (Continuous Integration) 8403a32 Merge pull request #4920 from code-dot-org/testfixes (Elijah Hamovitz) 0ff348c Temporarily removing funOMeter test (Elijah Hamovitz) b457e24 Merge pull request #4916 from code-dot-org/ie10tests (Bjvanminnen) 5b89e35 more IE10 (Brent Van Minnen) 1876a7f o Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging (Trevor Berg) 541fdc5 Fix issues with JSONFileDataAdapter (Trevor Berg) 0f13914 iOS requires directly-bound click events and 'cursor: pointer' style for click events to work (Elijah Hamovitz) 5b6b40f Feature-check SVG filter support before creating/applying a filter. (Brad Buchanan) 656f7c2 Merge pull request #4877 from code-dot-org/bundle_install_frontends (Will Jordan) b7be14d Automatically built. (Continuous Integration) 16bc449 Merge pull request #4903 from code-dot-org/only_setup_local_pegasus_db (philbogle) 7460930 Merge pull request #4911 from code-dot-org/remerge-project-expect-channel (Josh Lory) f53452b start running applab tests on IE 10 (Brent Van Minnen) 4907658 Merge pull request #4915 from code-dot-org/revert-4723-ajax_sign_in (philbogle) c266d62 Revert "Render the sign-in/sign-out button in the Dashboard header using Ajax" (philbogle) 0dc2fb9 Header (and 'Remix' button) doesn't show up on mobile [ci skip] (Josh Lory) 7317599 Merge pull request #4913 from code-dot-org/all-responses (Laurel) 3130e6c Merge remote-tracking branch 'origin/staging' into pulse-item (Brad Buchanan) e28f355 Deduplicate functions and remove last SMIL TODO comment. (Brad Buchanan) 9ac35c2 Merge pull request #4723 from code-dot-org/ajax_sign_in (philbogle)
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.
Reverts #4905. I've fixed the regression, added a UI test and re-merged the changes from #4822.