Commit Graph

2899 Commits

Author SHA1 Message Date
Geoff Schmidt
b9f63839e6 Merge branch 'devel' into sso 2013-12-19 17:17:01 -08:00
David Glasser
f65b1cd2ae Remove backwards-compatibility code
There's no need to be backwards-compatible here with something that has
never worked (or at least hasn't worked since 0.6.5).
2013-12-19 17:00:58 -08:00
David Glasser
6844cb2615 Add test for #1668 2013-12-19 17:00:38 -08:00
Mitar
a21f0d2e58 Pass "bare" option when using CoffeeScript as well. 2013-12-19 16:54:03 -08:00
David Glasser
39e3f1ee1a In "dev mode" email, be more explicit.
Make it clear that nothing is being sent and point users to MAIL_URL.

Fixes #1196.
2013-12-19 15:07:39 -08:00
Naomi Seyfer
2b36c8be33 Count new servers already started in ctl before starting lots more 2013-12-19 13:33:18 -08:00
Naomi Seyfer
27c364a21a Count new servers already started in ctl before starting lots more 2013-12-19 13:32:19 -08:00
Geoff Schmidt
81f8659d21 update login tokens before rerunning publish functions 2013-12-18 18:33:19 -08:00
Emily Stark
48521f9d18 Use only websockets transports for sockjs when behind a DDP proxy 2013-12-18 16:41:32 -08:00
Emily Stark
3003f46347 Use special bind path for panel 2013-12-17 22:23:24 -08:00
David Glasser
0f4a21f89f meteor_npm: don't lose interesting resolved
If an indirect dependency resolves to something other than a semver (or
a GitHub tarball), it will be stored in the 'resolved'. Our shrinkwrap
minifier (which helps to reduce spurious shrinkwrap file changes) needs
to recognize that.

Also, consistently use the "version" field in the minified shrinkwrap
file (which a comment already claimed we could do).

Fixes #1684.
2013-12-17 19:05:25 -08:00
icellan
fa25bcafb4 Removed extra comma at end of method. Fixes IE7 2013-12-17 17:00:48 -08:00
Naomi Seyfer
f0f7ae2d16 Do not loop forever on ie8 2013-12-17 12:12:20 -08:00
David Glasser
b684ca9554 Merge branch 'master' into devel
Conflicts:
	History.md
2013-12-17 11:11:16 -08:00
David Glasser
4771b71734 Rename 0.6.7 to 0.7.0 2013-12-17 10:48:54 -08:00
David Glasser
e042e5a85a 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 17:42:51 -08:00
David Glasser
cce9d36dfa Add some XXX comments about when we should re-poll 2013-12-16 17:42:49 -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
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
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
Nick Martin
a6c8b5eef3 Give up on documenting facts current api. 2013-12-15 19:40:57 -08:00
David Glasser
2991ac9312 fix missing expect() call in password-tests
add a console.trace that helps debug it
2013-12-15 17:17:33 -08:00
David Glasser
2f745bb52f Test changing Date and ObjectID 2013-12-15 17:17:25 -08:00
Nick Martin
20e8e4241c Retry subscription on error. 2013-12-15 17:17:17 -08:00
Nick Martin
8b37c0084d Make facts automatically subscribe when you show the template.
Also, namespace the collection and subscription name.
2013-12-15 17:17:09 -08:00
David Glasser
fd215633cc Make observe driver facts names consistent 2013-12-15 17:16:59 -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 0d5060eb6a.
This reverts commit f2e3481db3.
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
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
David Glasser
71ca231c2b Take out check that can fail during failover 2013-12-12 23:54:46 -08:00
Nick Martin
a5d5a03189 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 23:54:32 -08:00
David Glasser
5ebf0f2ec3 Avoid 100% CPU in tailing during Mongo failover 2013-12-12 23:54:22 -08:00