Commit graph

18218 commits

Author SHA1 Message Date
Jakob Ackermann
d17ef183d0 [Router] gracefully set and do not reset the ol_context 2020-06-22 17:04:30 +01:00
Jakob Ackermann
ce4f9148c3 [perf] WebsocketLoadBalancer: move back to a sync loop for msg fan out 2020-06-22 17:04:15 +01:00
Jakob Ackermann
a70c1e1fa2 [perf] WebsocketLoadBalancer: check is_restricted_message once
...and filter clients early on.
2020-06-22 17:04:15 +01:00
Jakob Ackermann
5282f8f531 [misc] synchronous client store using an Object at .ol_context 2020-06-22 17:04:08 +01:00
Miguel Serrano
f2cae26166 Merge pull request #157 from overleaf/msm-update-deps
Update Dependencies
2020-06-22 15:45:11 +02:00
Miguel Serrano
3ffc218b2c Rolled back redis-sharelatex to 1.0.12 2020-06-22 13:13:44 +02:00
Jakob Ackermann
9c1335720c Merge pull request #156 from overleaf/jpa-fully-handle-subscribe-error
[misc] RoomManager: emitOnCompletion: properly handle Promise rejections
2020-06-22 11:35:03 +02:00
Brian Gough
2b342c6e53 Merge pull request #181 from overleaf/bg-fix-503-response
handle EPIPE errors in CompileController
2020-06-22 09:30:35 +01:00
Brian Gough
beb452e4e0 Merge pull request #2930 from overleaf/bg-downgrade-recently-compiled-warning
remove unnecessary recently-compiled warning

GitOrigin-RevId: ee9feaf932e741d40741568f63fcf65ac42fb27d
2020-06-20 02:10:52 +00:00
Brian Gough
8c4e4bab3f Merge pull request #2908 from overleaf/bg-add-missing-leave-doc-event
add leaveDoc event

GitOrigin-RevId: 6d8a40b1226ced7d853e2b72f02d484619a982ce
2020-06-20 02:10:47 +00:00
Brian Gough
63e8c48c77 Merge pull request #2926 from overleaf/bg-create-alpha-compile-group
create alpha compile group

GitOrigin-RevId: edc063ef591a1bed20600a9418e2114f8ab0a3df
2020-06-20 02:10:42 +00:00
Brian Gough
2a6f18b6a0 Merge pull request #2917 from overleaf/bg-send-compile-group-parameter
send compileGroup parameter in body of clsi request

GitOrigin-RevId: 05e9b24ea15751464104e5b0f6aef17c66a448d2
2020-06-20 02:10:37 +00:00
Miguel Serrano
e96538f7ba Added new line at the end of .gitignore 2020-06-19 19:25:40 +02:00
Miguel Serrano
0f00aa4d47 Added *.js.map entry to .gitignore 2020-06-19 19:24:59 +02:00
Miguel Serrano
105335c62a Remove source maps 2020-06-19 19:19:15 +02:00
Miguel Serrano
ce3266c59c Fixed sha downgrades 2020-06-19 17:29:31 +02:00
Shane Kilkelly
6ff3877dd1 Fix status and healthcheck tests 2020-06-19 15:50:51 +01:00
Shane Kilkelly
ec278ffe0a Fix log lines 2020-06-19 15:50:42 +01:00
Shane Kilkelly
ed778639a8 Move the status and healthcheck to root level 2020-06-19 15:50:27 +01:00
Shane Kilkelly
8def058d85 Fix log level 2020-06-19 15:50:16 +01:00
Miguel Serrano
1e1f6ca19f Updated 'uid-safe' and minor/patch dependencies 2020-06-19 16:26:32 +02:00
Christopher Hoskin
9437266dcb Merge branch 'master' into jpa-csh-tracing-end-time-from-fs 2020-06-19 11:41:15 +01:00
Jessica Lawshe
366a925903 Merge pull request #2919 from overleaf/ta-admin-update-empty
Allow  Empty Strings in Admin Form Updates

GitOrigin-RevId: 79c1315dcb56ebdd82094653c67dcd83b1b53b87
2020-06-19 02:10:32 +00:00
Jessica Lawshe
cc46e33681 Merge pull request #2920 from overleaf/ta-custom-subscription-contact
Update Custom Subscription Wording

GitOrigin-RevId: a4582aadcae0689022ec0c74d4be4853c8cebf34
2020-06-19 02:10:27 +00:00
Jessica Lawshe
7d0b3f5cd1 Merge pull request #2921 from overleaf/jel-admin-redirect-after-login
Redirect after login for admin pages

GitOrigin-RevId: 3cd99796cd38298a866444fc7d58317935e13817
2020-06-19 02:10:22 +00:00
Jessica Lawshe
bfe06015c8 Merge pull request #2913 from overleaf/jel-cms-fields-check
Add fields check for CMS images

GitOrigin-RevId: 53d525ea9861cb8d025920c535054ced6886ca72
2020-06-19 02:10:15 +00:00
Chrystal Maria Griffiths
d946ac2a99 Merge pull request #2918 from overleaf/cmg-covid-upgrades
Update copy for WFH notifications for free users

GitOrigin-RevId: 420951266e431d490e05da736f9d167934364df3
2020-06-19 02:10:10 +00:00
Miguel Serrano
fc6d810972 Merge pull request #85 from overleaf/msm-pinned-s3mock-docker-image
Pinned adobe/s3mock docker image
2020-06-18 16:10:43 +02:00
Miguel Serrano
4fb6c82fc4 Merge pull request #82 from overleaf/ew-jpa-fix-express-deprecations
[misc] fix express deprecations
2020-06-18 16:10:33 +02:00
Shane Kilkelly
3c6ef38036 Fix alignment of function 2020-06-18 15:00:17 +01:00
Shane Kilkelly
40a171d44a Also check we can touch the filesystem in healthcheck 2020-06-18 14:56:50 +01:00
Shane Kilkelly
973a18b1b8 Clean up new healthcheck test 2020-06-18 14:56:38 +01:00
Shane Kilkelly
badeea3e0b Add test for status and health-check endpoints 2020-06-18 13:54:10 +01:00
Shane Kilkelly
689362b24f Use the bridge.healthCheck method 2020-06-18 11:45:21 +01:00
Shane Kilkelly
86769eedea Add a healthCheck method to the Bridge, check db 2020-06-18 11:45:04 +01:00
Simon Detheridge
b83ee27f83 Initial commit 2020-06-18 11:24:36 +01:00
Brian Gough
22480f1a52 handle EPIPE errors in CompileController 2020-06-18 09:54:18 +01:00
Brian Gough
ff2c69272f Merge pull request #180 from overleaf/bg-add-compile-groups
add compile groups support
2020-06-18 08:52:45 +01:00
Ersun Warncke
b73319acc1 make variable naming more clear
GitOrigin-RevId: fba9406b20d21baaadc2e2fadc9597914396f85a
2020-06-18 02:10:59 +00:00
Ersun Warncke
b335bcb67d ObjectId query args
GitOrigin-RevId: 04e2258045c2cb4e2f93a24d842e67cb7996b5ce
2020-06-18 02:10:54 +00:00
Ersun Warncke
d3a30929f7 always send update for project owner, pr fixes
GitOrigin-RevId: a58ecfb13c25df02ccf79c189903b5a6fcddd835
2020-06-18 02:10:48 +00:00
Ersun Warncke
5e84d95291 filter tpds users by dropbox
GitOrigin-RevId: ea1222597a9b3e807100abcc2bea957db7faee5f
2020-06-18 02:10:43 +00:00
Ersun Warncke
387695c2b1 send tpds updates for all dropbox users
GitOrigin-RevId: b690693b98b0b6288a4c3a734d4ff2d28901a496
2020-06-18 02:10:38 +00:00
Shane Kilkelly
1befc3582b wip: add skeleton health-check handler 2020-06-17 16:15:40 +01:00
Shane Kilkelly
eba6c907e9 wip: status handler 2020-06-17 16:05:53 +01:00
Miguel Serrano
16922bf177 Pinned adobe/s3mock docker image 2020-06-17 16:36:57 +02:00
Miguel Serrano
aad135b7c8 Merge pull request #84 from overleaf/lint-format
Lint & Format
2020-06-17 14:59:43 +02:00
Brian Gough
bdebef91eb Merge branch 'master' into bg-add-compile-groups 2020-06-17 11:58:26 +01:00
Jakob Ackermann
5f7841526f [misc] RoomManager: emitOnCompletion: properly handle Promise rejections
```
result = Promise.all([<Promise that rejects eventually>]) # rejection 1
result.then () -> RoomEvents.emit(eventName)              # rejection 2
result.catch (err) -> RoomEvents.emit(eventName, err)     # handle r1
```
As shown above, the second rejection remains unhandled. The fix is to
 chain the `.catch()` onto the `.then()` Promise.
2020-06-17 09:29:12 +01:00
Jessica Lawshe
9c9993684c Merge pull request #2911 from overleaf/jel-rename-containers
Update migration script for web container name change

GitOrigin-RevId: e3cefe58f571ab4adf8d7e2b28d19148f394cc83
2020-06-17 02:10:42 +00:00