Emily Stark
373bc2ceec
Allow overwriting ~/.meteorsession file with env var.
...
Useful for tests.
2013-12-16 22:03:50 -08:00
Emily Stark
546c344b3d
Merge branch 'devel' into sso
...
Conflicts:
packages/ctl-helper/ctl-helper.js
packages/webapp/webapp_server.js
2013-12-16 17:30:43 -08:00
Geoff Schmidt
c1f9b423c5
Correctly handle exceptions in http-helpers
2013-12-16 16:16:53 -08:00
David Glasser
e6c87236a6
Fix "drop collection" test failure
...
There was a race condition in the manipulation of the write fence by the
drop collection code. Specifically, when seeing a "drop collection"
oplog entry, OplogObserveDriver took no immediate action and instead
deferred some "should I re-poll now or later?" logic.
This allowed the write fence's oplogHandle.waitUntilCaughtUp code to
think that everything was "caught up" even though the effects of the
"drop collection" entry had not yet affected the cursor's state (by
transitioning it away from the STEADY state). The fix is to ensure that
the state-change aspects of processing the entry occur immediately; the
actual re-query is still deferred in order to not block the oplog tailer
from continuing.
Reported by: @awwx
(The previous failure can made consistently reproducible by replacing the
`Meteor.defer` that is removed by this commit with a
`Meteor.setTimeout(,200)`.)
2013-12-16 15:14:43 -08:00
Emily Stark
63c7aecbda
Remove stray space on galaxy login
2013-12-16 14:32:33 -08:00
Naomi Seyfer
37c63ffae7
Package instead of Meteor to measure js loading; allow use of webapp a la carte
...
Also change the timing to allow more time for new servers to come up.
2013-12-16 12:14:01 -08:00
Emily Stark
9780c5b8af
Allows apps to set ROOT_URL with Ctl.rootUrl
2013-12-15 20:22:10 -08:00
Emily Stark
4aa5eb181a
Interpret sockjs /info base_url relative to original base_url
2013-12-14 19:42:20 -08:00
Geoff Schmidt
ad5f3fff45
Merge remote-tracking branch 'refs/remotes/origin/sso' into sso
2013-12-13 18:18:38 -08:00
Geoff Schmidt
e63837d0aa
Fix path binding bug
2013-12-13 18:18:23 -08:00
Geoff Schmidt
3a1e25f647
Comments about DDP path resolution and path prefixes
2013-12-13 18:17:32 -08:00
Slava Kim
cb4a278d4b
Revert "Before minifying CSS pull out all @import's to the top of CSS file."
...
This reverts commit 0d5060eb6af2e3481db3
2013-12-13 17:53:52 -08:00
Nick Martin
001d2df968
Retry subscription on error.
2013-12-13 15:56:06 -08:00
Naomi Seyfer
f92cb7d05d
Merge branch 'multi-server-update' into devel
2013-12-13 15:12:06 -08:00
Naomi Seyfer
7449577ef4
Did my own phabricator comments; mostly small touches
2013-12-13 14:40:10 -08:00
Naomi Seyfer
73f6d3c81c
Move code to adjust proxy binding tags to ctl-helper
2013-12-13 13:22:01 -08:00
ekatek
d62969fbce
Cleaning up previous propagation of version
2013-12-13 11:53:02 -08:00
ekatek
8e9ad07a09
use process.env.admin_app instead of a hardcoded array
2013-12-13 10:46:20 -08:00
Naomi Seyfer
5750dcd7c6
Move the check for css to be loaded out of a string into code
2013-12-13 10:03:36 -08:00
ekatek
4ab6f8ee88
tags
2013-12-13 10:03:35 -08:00
Naomi Seyfer
276034617a
First version of a reload safetybelt against javascript or css not being loaded properly
2013-12-13 10:03:35 -08:00
ekatek
57c4c075d3
removing error statement
2013-12-13 10:03:35 -08:00
Naomi Seyfer
9373bce638
Call updateTags on proxy in ctl
2013-12-13 10:03:35 -08:00
ekatek
7da8004ddf
version as tag
2013-12-13 10:03:35 -08:00
Naomi Seyfer
19964b351c
ctl-helper to return job id on creation of serverlike programs
2013-12-13 10:03:35 -08:00
Naomi Seyfer
a951ab2fee
New beginUpdate flow for ctl, run new and old job simultaneously
2013-12-13 10:03:35 -08:00
Naomi Seyfer
b7188769f2
remove scale
2013-12-13 10:03:35 -08:00
David Glasser
6a9a797e83
Make observe driver facts names consistent
2013-12-13 09:40:25 -08:00
Emily Stark
685431fb20
Fix check on forwardTo url
2013-12-12 23:35:52 -08:00
Emily Stark
1ab704be45
Fix double slash in proxy pathname
2013-12-12 23:35:09 -08:00
Emily Stark
4ba6d3f08d
Correct use of on galaxy login
2013-12-12 23:34:22 -08:00
Emily Stark
ae2404d1f3
Remove trailing slashes on pathnames for proxy bindings
2013-12-12 21:52:36 -08:00
Geoff Schmidt
ab87768a7e
Merge remote-tracking branch 'origin/devel' into sso
...
Conflicts:
packages/accounts-password/password_tests.js
tools/meteor.js
2013-12-12 18:51:45 -08:00
Geoff Schmidt
bbc3104777
fix bugs in new webapp binding code
2013-12-12 18:44:43 -08:00
Emily Stark
43dd92dd71
Allow galaxy auth app to not require auth on http
2013-12-12 17:42:54 -08:00
Geoff Schmidt
15730a89ce
Merge branch 'refs/heads/sso' into sso2
...
Conflicts:
tools/auth.js
2013-12-12 17:40:49 -08:00
Slava Kim
f2e3481db3
Drop the requirement for @import to be the last statement on the line
...
+ Testcase for that
2013-12-12 16:47:37 -08:00
Slava Kim
0d5060eb6a
Before minifying CSS pull out all @import's to the top of CSS file.
...
We need it as we concatenate all CSS files in one. @import's those were in the
beginning of file foo.css are now in the middle of giant concatenated sha1.css.
2013-12-12 16:30:04 -08:00
David Glasser
8e31d09c66
A few History tweaks
2013-12-12 16:20:27 -08:00
David Glasser
00dea841b2
Take out check that can fail during failover
2013-12-12 16:10:41 -08:00
David Glasser
0944988adf
Add some XXX comments about when we should re-poll
2013-12-12 16:05:29 -08:00
Nick Martin
7d490a5bec
Make facts automatically subscribe when you show the template.
...
Also, namespace the collection and subscription name.
2013-12-12 16:02:02 -08:00
Nick Martin
d5d11f7897
Apply patch to node versions 0.10.22 and 0.10.23.
...
0.10.23 just came out and hasn't made any changes to the streams
stuff we patch.
2013-12-12 15:24:33 -08:00
David Glasser
0e21a38043
Avoid 100% CPU in tailing during Mongo failover
2013-12-12 14:39:18 -08:00
David Glasser
7e02b83708
Test changing Date and ObjectID
2013-12-12 00:38:20 -08:00
David Glasser
c58d4d158b
Handle modifications to EJSON custom types
...
OplogObserveDriver cannot try to directly apply these
representation-level mutations; it needs to get the entire custom type.
This implementation is overly conservative, but in practice
Meteor-originated writes shouldn't mutate EJSON custom types
anyway (they should treat them as atomic).
2013-12-12 00:21:58 -08:00
David Glasser
738ffe50a1
fix missing expect() call in password-tests
...
add a console.trace that helps debug it
2013-12-12 00:21:57 -08:00
Nick Martin
dacc53f16e
First pass text for oplog tailing in History.md.
2013-12-11 23:57:09 -08:00
Nick Martin
04fddf3a77
Update tools tests for Webapp bundled asset change 6eccf8c
2013-12-11 20:38:51 -08:00
Nick Martin
506fb6a552
Also upgrade uglify-js.
2013-12-11 18:57:30 -08:00
