Jakob Ackermann
2b9d0868c5
[misc] test/acceptance: retrieve ingress metrics just before using it
...
The upload request can bump the ingress metric.
The content hash validation might require a full download
in case the ETag field of the upload response is not a md5 sum.
2020-02-28 12:27:06 +01:00
Jakob Ackermann
516102e6fb
[misc] test/acceptance: do not hard code fake credentials
2020-02-28 12:26:46 +01:00
Jakob Ackermann
847f124d7b
[misc] test/acceptance: skip the shutdown in case we did not start yet
...
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
2020-02-28 12:26:24 +01:00
Jakob Ackermann
6589aa6ae0
[misc] test/acceptance: harden the startup check for s3
...
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
2020-02-28 12:26:24 +01:00
Jakob Ackermann
94b8a7f891
[misc] test/unit: KeybuilderTests: use a unique suite label
2020-02-28 12:26:23 +01:00
Jakob Ackermann
54e3b57772
[misc] test/unit: add missing globals that are lazy loaded
2020-02-28 12:26:23 +01:00
Jakob Ackermann
7920570dd8
[misc] test/unit: add missing require stubs for metrics and settings
2020-02-28 12:26:22 +01:00
Eric Mc Sween
4e760e276a
Merge pull request #2622 from overleaf/em-promisify-editor-http-controller
...
Promisify EditorHttpController
GitOrigin-RevId: 938350f21a19c10c6bd4261086265a098e71e932
2020-02-28 04:18:42 +00:00
Eric Mc Sween
130f97d621
Merge pull request #2625 from overleaf/bg-fix-spelling-stateful-regexp
...
fix stateful regexp usage in SpellCheckManager
GitOrigin-RevId: 6ac93e6a9227a638b30882ce99771e30c1a097c1
2020-02-28 04:18:37 +00:00
Eric Mc Sween
5f712645ed
Merge pull request #2626 from overleaf/bg-fix-editor-regexps
...
fix stateful regexp usage in editor inputs
GitOrigin-RevId: 4950066251cb6235e218ff4f600fab2652d15e76
2020-02-28 04:18:33 +00:00
Eric Mc Sween
c120309dd0
Merge pull request #2591 from overleaf/pr-avoid-out-of-sync-error-spellcheck
...
Avoid out of sync error spellcheck
GitOrigin-RevId: e9772c01ffc0ffaca5d137e8e43e797903b727cd
2020-02-28 04:18:29 +00:00
Eric Mc Sween
77c75bf223
Merge pull request #2597 from overleaf/as-cleanup-tags-handler
...
Clean up tags handler
GitOrigin-RevId: 6e83880d9a38b323470933f6ef01fde187d55161
2020-02-28 04:18:25 +00:00
Eric Mc Sween
e80870f453
Merge pull request #2629 from overleaf/cmg-updateon-typo
...
Fix typo in user settings
GitOrigin-RevId: 066ee8047d807e9ac077eb687a93f12d9db6bf55
2020-02-28 04:18:21 +00:00
Eric Mc Sween
1da929fcdb
Merge pull request #2618 from overleaf/ew-clear-root-doc-on-delete
...
Clear root doc on delete
GitOrigin-RevId: 4121d198f5253417bca2284c5f750c088debcb8c
2020-02-28 04:18:17 +00:00
Eric Mc Sween
17969c50ce
Merge pull request #2611 from overleaf/ta-cmg-recurly-email-update-test-plus
...
Improve Recurly API Acceptance Test
GitOrigin-RevId: 89f4707c9baaa20e59f64821daa36551ad700118
2020-02-28 04:18:13 +00:00
Eric Mc Sween
174af14d46
Merge pull request #2610 from overleaf/ta-recurly-email-update-auto
...
Update Recurly Email on Default Email Change
GitOrigin-RevId: e2821d7bdc4bc6befff2152d92c76952c38694f9
2020-02-28 04:18:09 +00:00
Eric Mc Sween
403c9ae66b
Merge pull request #2627 from overleaf/jel-decaf-cleanup
...
Decaf cleanup
GitOrigin-RevId: 9e0770ce6c5362ea288fc1706014aacd45608008
2020-02-28 04:18:04 +00:00
Miguel Serrano
82b18e01b5
Merge pull request #4 from overleaf/msm-decaf
...
access-token-encryptor decaffeination
2020-02-27 15:56:32 +01:00
Simon Detheridge
00d949ba26
Merge pull request #94 from overleaf/spd-unhandled-errors
...
Write to error log on unhandled rejection/exception
2020-02-27 10:37:31 +00:00
Simon Detheridge
6e19a650d2
Write to error log on unhandled rejection/exception
2020-02-27 10:33:48 +00:00
Shane Kilkelly
d6cc769e0e
Merge pull request #78 from overleaf/sk-dependabot-upgrade-request-2.88.2
...
Bump request from 2.33.0 to 2.88.2
2020-02-27 09:21:45 +00:00
Brian Gough
509c23def7
Merge pull request #2631 from overleaf/bg-maintenance-messages-in-editor
...
display maintenance messages in editor
GitOrigin-RevId: 7d4fda60c5e2bd12d2cead2a9bff326b75e9c4e7
2020-02-27 04:17:59 +00:00
Brian Gough
ac5d688d8c
Merge pull request #2612 from overleaf/bg-precompile-web-views-only
...
only precompile views for web, not web-api
GitOrigin-RevId: 292f4d5dd6f81b1928ccd543898dfa643f1e5be8
2020-02-27 04:17:55 +00:00
Simon Detheridge
f9f558a039
Merge pull request #52 from overleaf/spd-decaf
...
Decaffienate docstore
2020-02-26 13:32:30 +00:00
Shane Kilkelly
622ab898d9
upgrade requestretry to 4.1
2020-02-26 12:25:13 +00:00
Brian Gough
852ae5fbae
move bunyan out of devDependencies
...
(needed by @google-cloud/logging-bunyan)
2020-02-26 09:47:38 +00:00
Shane Kilkelly
2686f5e72a
Merge pull request #2630 from overleaf/sk-fix-token-login-redirect
...
Remember token page when redirect to login
GitOrigin-RevId: 1c4d7b8ae034ef2d63cc680405c099405024f4d1
2020-02-26 04:24:06 +00:00
Shane Kilkelly
7cbb00f207
Merge branch 'sk-token-csrf-protection'
...
GitOrigin-RevId: e71f7264be45b665502150e9ffbb85b3fc94665e
2020-02-26 04:24:01 +00:00
Simon Detheridge
c2a940e1fe
Merge pull request #150 from overleaf/jpa-dependencies-cleanup
...
[misc] dependencies cleanup
2020-02-25 17:47:02 +00:00
Miguel Serrano
1997125b18
Merge pull request #151 from overleaf/msm-decaf-smoke-load
...
Decaffeinate smoke and load tests
2020-02-25 18:20:35 +01:00
mserranom
41533d8888
moved decaffeinated files to js folder
2020-02-25 17:15:31 +01:00
decaffeinate
252f4c704b
decaffeinate: Run post-processing cleanups on loadTest.coffee
2020-02-25 17:03:58 +01:00
decaffeinate
3901fe9cd2
decaffeinate: Convert loadTest.coffee to JS
2020-02-25 17:03:57 +01:00
decaffeinate
e20da38e09
decaffeinate: Rename loadTest.coffee from .coffee to .js
2020-02-25 17:03:57 +01:00
decaffeinate
2057a565ec
decaffeinate: Run post-processing cleanups on SmokeTests.coffee
2020-02-25 17:03:39 +01:00
decaffeinate
b6991f5ff9
decaffeinate: Convert SmokeTests.coffee to JS
2020-02-25 17:03:37 +01:00
decaffeinate
92ed86bb33
decaffeinate: Rename SmokeTests.coffee from .coffee to .js
2020-02-25 17:03:36 +01:00
Jakob Ackermann
6155c8a097
[misc] cleanup unused dependency on mongo and redis
2020-02-25 14:45:09 +01:00
Jakob Ackermann
a05c048b3b
[misc] rename npm-shrinkwrap.json to package-lock.json
2020-02-25 14:45:09 +01:00
Miguel Serrano
5be9685428
Merge pull request #149 from overleaf/msm-service-decaf
...
clsi decaffeination
2020-02-24 14:48:29 +01:00
Simon Detheridge
bc80402eda
Merge pull request #18 from overleaf/spd-decaf
...
Decaffeinate contacts
2020-02-24 11:49:44 +00:00
Brian Gough
0419039d4d
Merge branch 'master' into bg-use-separate-redis-for-project-history
2020-02-21 14:13:33 +00:00
Brian Gough
2e178b0e2d
resolve merge conflicts
2020-02-21 14:06:58 +00:00
Timothée Alby
995dbc514d
Merge pull request #2594 from overleaf/jel-flag-affiliation-when-registering
...
Flag unchecked affiliation when registering
GitOrigin-RevId: c9da12ceb5a1712c8c477222f967fb54eceef252
2020-02-21 04:21:16 +00:00
Timothée Alby
f5e2983a6b
Merge pull request #2609 from overleaf/ta-cmg-recurly-email-update
...
Add UI to Update Recurly Email
GitOrigin-RevId: 920a741fd9b4312f031bdd40e3d6bec48f1bd579
2020-02-21 04:21:12 +00:00
Timothée Alby
506543d6a0
Merge pull request #2605 from overleaf/jel-sso-registration
...
Do not block SSO registration on nonessential errors
GitOrigin-RevId: c9d6a7803aa8a48dbc1a8aae84d6f2588bad654e
2020-02-21 04:21:07 +00:00
Timothée Alby
b94e1791e0
Merge pull request #2617 from overleaf/ho-open-site-for-admins
...
allow site to be accessible to admins when closed
GitOrigin-RevId: 71bdf329ce2a4e41533b2a65f45190277ea72dbb
2020-02-21 04:21:03 +00:00
Timothée Alby
98f031e9aa
Merge pull request #2619 from overleaf/ta-licence-attribute-fix
...
Read Licence Attribute from Affiliation Instead of Institution
GitOrigin-RevId: 2294222e2bd0da473a303d3ffdc5ddb7d856f7f7
2020-02-21 04:20:59 +00:00
nate stemen
ab5101f189
Merge pull request #2613 from overleaf/spd-tags-timeout
...
Use a longer timeout when talking to the tags API
GitOrigin-RevId: 467f981c1818293c28dd288d7223540597a8ca3e
2020-02-21 04:20:55 +00:00
nate stemen
10d6a9b7f2
Merge pull request #2589 from overleaf/ns-hide-v1-projects
...
ensure v1 projects folder not shown on dashboard if empty
GitOrigin-RevId: d8c0f1352fc2e8d891eb76f7d1ef00126a4f581e
2020-02-21 04:20:49 +00:00