Commit graph

473 commits

Author SHA1 Message Date
Jessica Lawshe
c5d35bce0e Merge pull request #10260 from overleaf/jel-script-messages
[web] Update script logs

GitOrigin-RevId: 5f98ac127a87250d4d75c6092ea8c051ac9ab46a
2022-11-15 09:06:40 +00:00
Eric Mc Sween
8be8dd4cc0 Merge pull request #10402 from overleaf/bg-sync-plan-prices-to-recurly
script to sync prices to recurly

GitOrigin-RevId: c6659f749136a9aeb2f90631470e144e9d1180a8
2022-11-15 09:06:11 +00:00
Eric Mc Sween
c9f8080769 Merge pull request #10372 from overleaf/ii-adjust-plans-prices
Adjust plans prices and automate the process of generating the prices lists

GitOrigin-RevId: 06be1f9a26837ed9bb7eca598cd88b6288244338
2022-11-15 09:05:56 +00:00
Brian Gough
495dd9016d Merge pull request #10290 from overleaf/bg-clear-feedbacks-collection
add script to clear old messages from mongo feedbacks collection

GitOrigin-RevId: a4986f432a12e801f41ff9bdf11b8771ef2b601f
2022-11-07 09:03:25 +00:00
Timothée Alby
9ac016127d Merge pull request #9967 from overleaf/jpa-web-scripts-increase-timeouts
[web] scripts: increase mongo query timeouts by default (30s -> 5min)

GitOrigin-RevId: bdd1a504799ac1d42c52c3966b1072f721398e12
2022-10-18 08:03:06 +00:00
Eric Mc Sween
20a69289db Merge pull request #9961 from overleaf/em-fix-empty-name
Fix filetree entry with an empty name

GitOrigin-RevId: 2fecdde67954472e1d34bccc1ccf7015a0b98752
2022-10-14 08:04:33 +00:00
Alf Eaton
609483b4f0 Merge pull request #9963 from overleaf/msm-option-skip-audit
[scripts] option to skip user migration in `migrate_audit_logs`

GitOrigin-RevId: 738465abeca0d95a493bc3d805f4822dd29760a2
2022-10-14 08:04:07 +00:00
Eric Mc Sween
da30da76b2 Merge pull request #9894 from overleaf/em-node-fetch-web
Replace request-promise with node-fetch in web

GitOrigin-RevId: 07dbb6db7fd42326807aaeb18e5ee39f7c3d4668
2022-10-13 08:04:24 +00:00
Eric Mc Sween
a177872179 Merge pull request #9892 from overleaf/em-bad-filetrees
Add more ways to fix bad filetrees

GitOrigin-RevId: a60ab819fbd7c0547cf2d00022df71d4cba5cf9d
2022-10-12 08:04:21 +00:00
Miguel Serrano
b1937700cc Merge pull request #9864 from overleaf/msm-fix-audit-log
[scripts] fix audit log migration script

GitOrigin-RevId: a7e32217385ac66a899e34eb3e0e8373bc802944
2022-10-05 13:26:15 +00:00
Miguel Serrano
877638f09c [web/scripts] Process users' projects with promiseMapWithLimit() (#9807)
* [web/scripts] Process users' projects with `promiseMapWithLimit()`
* [web/scripts] Added several optimisations to migration script

GitOrigin-RevId: 0dd221a3a8b4bb64f412636faa17e81249ca6c4f
2022-10-05 08:04:02 +00:00
Brian Gough
51806703b7 Merge pull request #9819 from overleaf/bg-node-upgrade
upgrade from node 16.16.0 to 16.17.1

GitOrigin-RevId: e1db74d950ce452303212c66ce3fe06fbd1dfe59
2022-10-04 08:02:41 +00:00
Miguel Serrano
aefcf3c8bc Merge pull request #9795 from overleaf/msm-audit-log-migration-fix
[web/scripts] Fix audit log migration script

GitOrigin-RevId: 55c90520240bef92a4be1925809cac178c8b3ee9
2022-09-30 08:04:55 +00:00
Miguel Serrano
74f44e655a Merge pull request #9617 from overleaf/msm-audit-log-collections
Move project/user audit logs to their own collections

GitOrigin-RevId: f6f89b3e2815c0fe5691a79eceb35b77b3c370d8
2022-09-30 08:04:17 +00:00
Alf Eaton
7ce229be0c Merge pull request #9583 from overleaf/msm-script-project-size
[web] Script to count project sizes

GitOrigin-RevId: a8ff5e083147fe1ad288f1eff023984ae19e3a86
2022-09-16 08:05:24 +00:00
Eric Mc Sween
e3303bb276 Merge pull request #9409 from overleaf/em-send-more-metadata-to-tpds
Send more metadata to TPDS

GitOrigin-RevId: e6a76a9974fbd8a7fc6a6b861c88ff4728301bc3
2022-08-31 08:03:45 +00:00
Eric Mc Sween
8b2f8ce243 Merge pull request #9383 from overleaf/em-file-tree-histories
Track source for all file tree operations

GitOrigin-RevId: ff95ea8e99bfa30203a2a42968519bbaba65e708
2022-08-26 08:03:30 +00:00
Thomas
4198eb2789 Add script to delete projects from the command line for cleanup of ownerless projects (#9106)
* Add script for deleting projects via command line

GitOrigin-RevId: bc08e4a39986e9d43dd103a14c28b02ca9ce84d9
2022-08-09 08:02:49 +00:00
Alasdair Smith
6d89ab0377 Add script to delete orphaned doc comment ranges (#9086)
Add script to delete orphaned doc comment ranges

GitOrigin-RevId: c9ee92f791f8657ba0157cc843445c3cba144312
2022-08-05 08:04:14 +00:00
Jakob Ackermann
a31f30ed44 Merge pull request #9030 from overleaf/msm-update-allowdowngrade-script
[scripts] Change batching in `unset_allow_downgrade.js`

GitOrigin-RevId: 42542f1b2ca75d184cf2d812f3ebaf291a5992b6
2022-07-29 08:04:28 +00:00
Mathias Jakobsen
e0c23d83da [web] Add auditing of email removals (#8904)
* [web] Add auditing of email removals

* [web] Improve auditing of email removal from script

GitOrigin-RevId: ccb948f01616a0bcb2d8f718d6b9e69585e8bb89
2022-07-27 12:17:31 +00:00
Brian Gough
e7531eb047 Merge pull request #8871 from overleaf/briangough-issue8868
Upgrade node to v16.16.0

GitOrigin-RevId: 6bc6d63aa4af1940649f1eb5966f182250ecac22
2022-07-18 08:04:37 +00:00
Brian Gough
e32d1dbdd6 Merge pull request #8786 from overleaf/bg-check-age-for-migration
enforce cutoff date for track-changes history migration

GitOrigin-RevId: cd7b76281c66b7e6edc856d70660f2c5b8ae5275
2022-07-12 08:03:11 +00:00
Brian Gough
73f85d6e51 Merge pull request #8780 from overleaf/bg-import-zip-file-for-migration
import track-changes zip file from disk for history migration

GitOrigin-RevId: cb1d7f57e60ea6f627e63753c22f2ffc7e3b79ac
2022-07-12 08:03:05 +00:00
Brian Gough
a822819582 Merge pull request #8762 from overleaf/bg-force-new-history-on-failure
[web] allow forcing new history on migration failure

GitOrigin-RevId: bf84a6edf5a10b6aa3a1653e13a213552cb9272e
2022-07-12 08:03:02 +00:00
June Kelly
34a7d3598f Merge pull request #8787 from overleaf/msm-force-doc-flush
[web] script to force flushing docs to mongo

GitOrigin-RevId: 6ce3c1e456b92610fe4f90993b373db2070ab392
2022-07-11 08:04:42 +00:00
Miguel Serrano
88575dc58e Merge pull request #8735 from overleaf/msm-unset-allow-downgrade
[web] script to unset `history.allowDowngrade` in projects

GitOrigin-RevId: c30dfa64bfdd492d659cce308628f9e118449d5c
2022-07-08 08:03:43 +00:00
Brian Gough
5a3318f5b3 Merge pull request #8701 from overleaf/bg-simple-iterable-paths
simple iterable paths

GitOrigin-RevId: f6906016888ccfc95c88858bdac4d2633fc1c5f4
2022-07-05 08:03:43 +00:00
Brian Gough
be71ea690d Merge pull request #8687 from overleaf/bg-validate-migration-updates
[web] validate updates in history migration

GitOrigin-RevId: 35e11417ff83db81ad1dfd29165577e142e64f74
2022-07-05 08:03:32 +00:00
Brian Gough
da02a4f2be Merge pull request #8644 from overleaf/bg-archive-track-changes
archive track changes zip files in project when history migration fails

GitOrigin-RevId: 67f2381b0a8f2fb1de82100752031c65808af885
2022-07-01 08:03:52 +00:00
Brian Gough
496f283892 Merge pull request #8544 from overleaf/bg-fix-log-message
fix message in downgrade_project script

GitOrigin-RevId: 9619f1122d1d242a1f3cfd7e07c7ddfd908e340e
2022-06-24 08:03:40 +00:00
Brian Gough
b0d48c49f2 Merge pull request #8536 from overleaf/bg-downgrade-history-script
[scripts] downgrade history for a project

GitOrigin-RevId: 620440482e176404529edcbe89d696970bdc5652
2022-06-23 08:02:32 +00:00
June Kelly
a450a74351 Upgrade async package to 3.2.2 (#8447)
* Revert "Revert "Bump async to 3.2.2 (#7618)""

This reverts commit 75153a555211d654744c2e61e27fe21085826c22.

* [web] fix usage of async.queue.drain in script

* [clsi] fix usage of async.queue.drain

* [spelling] fix usage of async.queue.drain

* [redis-wrapper] fix usage of async.queue.drain

* [web] Test that LockManager queue is cleared

This protects against a regression found when upgrading the
async package. Here we test that the `queue.drain` callback
is really getting called, and the lock is being removed from
the LOCK_QUEUES map.

* [redis-wrapper] Upgrade async to 3.2.2

GitOrigin-RevId: df921e6d7f1d505bd467f22e58600ba1aff48869
2022-06-22 08:03:35 +00:00
Miguel Serrano
1c78e211f6 Merge pull request #8513 from overleaf/msm-fix-conversion-typo
[web] fixed env names in scripts

GitOrigin-RevId: 3989514b23773642d4834ffca12cf97c756ade4c
2022-06-21 08:03:17 +00:00
Miguel Serrano
e7c8329491 Merge pull request #8492 from overleaf/msm-history-migration-convert-large-docs
[web] Updated history upgrade scripts to move large docs to filestore

GitOrigin-RevId: 11ac9fc879ff03756e3ec41bb156e878c4223014
2022-06-21 08:03:13 +00:00
Brian Gough
bc31247d24 Merge pull request #8471 from overleaf/bg-ignore-upgradefailed-when-history-does-not-exist
[scripts] allow history upgrade in failure case

GitOrigin-RevId: 7c789968bd74719e3a0232422094ae3e9231a044
2022-06-20 08:04:17 +00:00
Davinder Singh
ff6c88de0c Merge pull request #8452 from overleaf/jel-check-emails-script
[web] Check users concurrently

GitOrigin-RevId: 2bca99c5b6b84ddb71b0f96c412238ecffa0f953
2022-06-17 08:03:22 +00:00
Timothée Alby
34bc2ac9ec Merge pull request #8402 from overleaf/msm-history-conversion-script
[web] Allow running history conversion script on single project

GitOrigin-RevId: 799d0a00e2ebabe6c7bbfd6bdbdb58a6025ce53f
2022-06-15 08:04:30 +00:00
Timothée Alby
343cfe4f06 Merge pull request #8360 from overleaf/jel-remove-not-needed-script
[web] Remove SAML backfill update script

GitOrigin-RevId: 5166ced7657ddc24c99bbd0873874e5c01bbab0f
2022-06-15 08:04:05 +00:00
Brian Gough
baa2d08b7f Merge pull request #8340 from overleaf/bg-one-shot-migration-script
[web] allow running history conversion script on single project

GitOrigin-RevId: 038005605a048d97d3fabcfa16b1c2421094e2e5
2022-06-10 08:03:31 +00:00
Timothée Alby
d94478b4a8 Merge pull request #8268 from overleaf/jel-script-check-emails
[web and v1] Script to check SAML emails

GitOrigin-RevId: 9c411858cdd4c2cc41ce8a7d4aa4228b98654c85
2022-06-09 08:02:39 +00:00
Miguel Serrano
c5f93bedea Merge pull request #8335 from overleaf/msm-fix-reset-rev-script
Fixed `reset_incorrect_doc_revision.js` script

GitOrigin-RevId: 59448881e372ca7ca6f3b50f76cab5476279a1ab
2022-06-09 08:02:23 +00:00
Miguel Serrano
3238694daa [web] Reset incorrect doc.rev value (#8331)
* [web] Reset incorrect `doc.rev` value

* Applied logging suggestions

GitOrigin-RevId: 6381fea438cf7409845d7a69c5d24e46cbec42c3
2022-06-09 08:02:20 +00:00
Jessica Lawshe
8c816b3b23 Merge pull request #6509 from overleaf/jel-migrate-sso-id
[v1 and web] Migrate institution SSO external user ID

GitOrigin-RevId: f31cd50fbada9a2704df1c837d695f2ff547420d
2022-06-08 08:03:22 +00:00
Thomas
6f55a99ae1 Merge pull request #6180 from overleaf/tm-history-upgrade-individual-projects
Add script for converting individual projects to FPH and history upgrade helper

GitOrigin-RevId: 4cf075e08045869fe87724fb28949fe91b780e93
2022-05-31 08:04:19 +00:00
Alf Eaton
16f3dc3abc Merge pull request #7829 from overleaf/ab-refresh-features-script-update
[web / script] Handle analytics and dropbox unlinking in refresh_features script

GitOrigin-RevId: 9d0524aeab5dcf810e28c3de4f61ab7f3913f872
2022-05-27 08:03:58 +00:00
Eric Mc Sween
1c0a9dae72 Merge pull request #8033 from overleaf/em-find-files-without-ids
Script to find files and docs without ids in projects

GitOrigin-RevId: 5c29d92748a01a1e48288479b25560127aafd397
2022-05-20 08:03:33 +00:00
Eric Mc Sween
c26a057522 Merge pull request #7932 from overleaf/em-find-bad-filenames
Script for finding bad doc and file names in projects

GitOrigin-RevId: 21035b9ce847d2c2a3183942458e2b30cc6c3fae
2022-05-19 08:03:48 +00:00
dependabot[bot]
2b2e9cfe45 Bump sanitize-html from 1.27.3 to 2.7.0 in /services/web/scripts/translations (#6651)
* [web] scripts/translations: update package-lock to version 2

* Bump sanitize-html in /services/web/scripts/translations

Bumps [sanitize-html](https://github.com/apostrophecms/sanitize-html) from 1.27.3 to 2.7.0.
- [Release notes](https://github.com/apostrophecms/sanitize-html/releases)
- [Changelog](https://github.com/apostrophecms/sanitize-html/blob/main/CHANGELOG.md)
- [Commits](https://github.com/apostrophecms/sanitize-html/commits/2.7.0)

---
updated-dependencies:
- dependency-name: sanitize-html
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* [web] adapt locales escaping and usage for new sanitize-html version

Co-authored-by: Jakob Ackermann <jakob.ackermann@overleaf.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
GitOrigin-RevId: 5df107a0a4b3d7c408f676ee363169f0ef0de28f
2022-05-18 08:04:19 +00:00
Jakob Ackermann
f0bd6dda23 Merge pull request #7986 from overleaf/jpa-eslint-8
[misc] upgrade eslint packages to the latest version everywhere

GitOrigin-RevId: f1480d4a171acef82fb26c4aa54be3a6088b0ab3
2022-05-17 08:05:59 +00:00
Alexandre Bourdin
eb81b2b6de Merge pull request #7010 from overleaf/ab-mixpanel-backfill-program
[web] Skip backfilling user program membership if not set

GitOrigin-RevId: a8193ee7701cd3229f1eafef23d7d0ed87e9aedc
2022-05-12 10:40:16 +00:00
June Kelly
ebc24c5bf9 Merge pull request #7788 from overleaf/jpa-deletion-retries
[web] add retries to project archiver deletion

GitOrigin-RevId: 90097a057b1ed6224151ddfb7f5c7be4ed4b34c4
2022-04-29 08:03:22 +00:00
Timothée Alby
ed688cce4e Merge pull request #7748 from overleaf/jpa-broad-schema
[misc] handle an old project archiver key schema when deleting projects

GitOrigin-RevId: 2da514c0533127f6d9f9d25cac62102c852ac2a2
2022-04-27 08:04:39 +00:00
Timothée Alby
62075a6ba9 Merge pull request #7735 from overleaf/jpa-fix-hard-deletion
[web] fix result handling from project-archiver hard deletion

GitOrigin-RevId: c6d7746e5e45b05d6372e5efcc029e0b566ace2d
2022-04-26 08:04:25 +00:00
Jakob Ackermann
bc574ef9e9 Merge pull request #7582 from overleaf/jpa-cleanup-project-archiver
[web] add a new script for hard deleting orphaned project archives

GitOrigin-RevId: 1fb49d60cc7c5fa3b8c2d644ac7ed9dbebe5e5d6
2022-04-26 08:03:42 +00:00
Jakob Ackermann
0120268c57 Merge pull request #7579 from overleaf/jpa-refactor-orphaned-data-helper
[web] de-duplicate logic for get a list of hard deleted project ids

GitOrigin-RevId: daf2ff427e24f9ef9253e4bc9ff52f53196fd854
2022-04-26 08:03:38 +00:00
Eric Mc Sween
f561650b62 Merge pull request #7578 from overleaf/em-fix-filetrees
Fix typo in script for bad filetrees

GitOrigin-RevId: 57394e5533f98a890223a0af6f4b389a82e60d84
2022-04-22 08:03:12 +00:00
Jakob Ackermann
f438bdcfed Merge pull request #7504 from overleaf/em-fix-bad-trees
Script for fixing bad file trees

GitOrigin-RevId: 061e306cc1df5774b496efff8e10714fbf1d738d
2022-04-13 08:03:48 +00:00
Eric Mc Sween
8ce9330a00 Merge pull request #7477 from overleaf/em-bad-filetree
Fix bad filetree script

GitOrigin-RevId: 8f9b7d94c717b21b2183d43fdccf4564408f71fa
2022-04-11 08:04:02 +00:00
Jakob Ackermann
b765aa40b0 Merge pull request #7485 from overleaf/jpa-upgrade-package-locks
[misc] upgrade package locks to v2

GitOrigin-RevId: 76df927b674220e17b6dd07f988dd56205673beb
2022-04-11 08:03:52 +00:00
Jakob Ackermann
7fc3c0e28a Merge pull request #6499 from overleaf/dependabot-npm_and_yarn-services-web-scripts-translations-postcss-7.0.39
Bump postcss from 7.0.32 to 7.0.39 in /services/web/scripts/translations

GitOrigin-RevId: 4ef42a483f286c5c346720188609bf3ad76e5370
2022-04-11 08:03:02 +00:00
Eric Mc Sween
ed40ce27ab Merge pull request #7467 from overleaf/em-bad-filetree
Find file trees that have null folder entries

GitOrigin-RevId: aa4c7ed180479288d4ce26549ceeaa0f5ebbd298
2022-04-08 08:05:02 +00:00
Eric Mc Sween
97dca3de1c Merge pull request #7422 from overleaf/em-bad-filetree
Cover more cases in bad filetree script

GitOrigin-RevId: 76aea86f56b16c60d3ed853e486bf00137f0ea5c
2022-04-08 08:04:00 +00:00
Eric Mc Sween
9c036b1d90 Merge pull request #7417 from overleaf/em-find-bad-file-trees
Script for finding malformed filetrees

GitOrigin-RevId: 256f724ec61c0a88a8904f9a4c028cfc78d6d0bb
2022-04-07 08:04:12 +00:00
Henry Oswald
380ba96a8b Merge pull request #7360 from overleaf/ho-purge-sess-improvements
improve the purge sessions script a bit

GitOrigin-RevId: 3b211c1377bc6aa117d3f872a829bb87b16fd9e5
2022-04-05 12:21:58 +00:00
Eric Mc Sween
3235119302 Merge pull request #7228 from overleaf/em-node-16
Upgrade to Node 16

GitOrigin-RevId: 3db1ae57ffb02f8a2b9012ffbb3efecfc01d2b04
2022-04-05 12:20:52 +00:00
Henry Oswald
9b71561814 Merge pull request #7302 from overleaf/ho-session-purge
mvp to purge session keys from redis

GitOrigin-RevId: d1298d4b042164d9c94a7a1d1b7560b6531ae093
2022-04-05 12:19:36 +00:00
Alf Eaton
a079aa1fae Merge pull request #7251 from overleaf/jpa-convert-doc-to-file-script
[web] convert convert-to-file endpoint into a script

GitOrigin-RevId: 5babebae5df8510b83f09ec4a2bb4064cca5ec75
2022-04-05 12:17:00 +00:00
Thomas
1aae979398 Send delete request to chat when expiring deleted projects (#6997)
* Send delete request to chat when expiring deleted projects

* Add script to clean-up orphaned chat of previously expired projects

GitOrigin-RevId: 157d100bd51b6204a9e31733b5164b8e7036ef01
2022-03-28 08:04:29 +00:00
Jakob Ackermann
1bee808551 Merge pull request #7220 from overleaf/jpa-wait-for-db
[web] scripts/undelete_project_to_user: add missing wait for db call

GitOrigin-RevId: 80a767d26ee529c0aabf8ce11a010dca4a51be2b
2022-03-25 09:03:59 +00:00
Jakob Ackermann
d993144fec Merge pull request #7214 from overleaf/jpa-refactor-insecure-endpoint
[web] refactor an insecure web-api endpoint into a script

GitOrigin-RevId: ba565a41d11fdaeb919dbf3cfe80c6f2e2474df1
2022-03-25 09:03:55 +00:00
Brian Gough
a28e0eaab0 Merge pull request #7073 from overleaf/bg-features-epoch
[web] add note to refresh_features.js script

GitOrigin-RevId: 5bda96df8a604c0d5b370aa25b0851486401ed7d
2022-03-17 09:03:30 +00:00
Alexandre Bourdin
5355c7382c Merge pull request #6984 from overleaf/ab-backfill-mixpanel-props
Add script to backfill Mixpanel properties for SSO users

GitOrigin-RevId: da7aef545dd4c66d3916febcc287043cbf455f65
2022-03-08 09:03:36 +00:00
Jakob Ackermann
fa55598c82 Merge pull request #6721 from overleaf/jpa-back-fill-staff-access
[web] scripts: add a new script for back filling staff access for admins

GitOrigin-RevId: c7eaa5887bdbc1a9594553961bd08fba48a451ed
2022-02-16 11:37:40 +00:00
Jakob Ackermann
ae0c347f27 Merge pull request #6542 from overleaf/jpa-em-code-sharing-workspaces
[misc] npm workspaces

GitOrigin-RevId: 87aa72db6637fb238d7cd35b0a48ac3ed58ab3eb
2022-02-16 11:31:07 +00:00
Timothée Alby
22ee7d6da2 Merge pull request #6525 from overleaf/jpa-harden-translations-sanitize
[web] scripts/translations: sanitize: double down on angular xss

GitOrigin-RevId: d08deab392942e593e920e648118f0e196af1740
2022-02-03 09:04:05 +00:00
Timothée Alby
58cf92620a Merge pull request #6523 from overleaf/jpa-translations-check-sanitize
[web] scripts/translations: add script for checking html sanitization

GitOrigin-RevId: d4b9c9a7eb1ed0ca9202b0cb6e4c33f3e73bd0e4
2022-02-03 09:03:58 +00:00
Jakob Ackermann
d90dc2bfae Merge pull request #6519 from overleaf/jpa-lodash-4-17-21
[misc] upgrade lodash from 4.x to 4.17.21

GitOrigin-RevId: 08e03981ffe0f2d3e3d29d9b094d98fcb2d95a6f
2022-02-01 09:03:29 +00:00
Jakob Ackermann
2ed696b3e0 Merge pull request #6517 from overleaf/jpa-node-fetch-2-6-7
[misc] upgrade node-fetch from 2.6.x to 2.6.7

GitOrigin-RevId: 5a43e82e23d78fd6e68a38655dab4665a401a9db
2022-02-01 09:03:24 +00:00
Jakob Ackermann
8789296f5a Merge pull request #6481 from overleaf/jpa-node-14-18-3
[misc] upgrade node version from 14.18.1 to 14.18.3

GitOrigin-RevId: 976542fcc0271e323695c59a987dcf1614ee633e
2022-01-28 09:03:53 +00:00
June Kelly
cc515afe95 Merge pull request #6484 from overleaf/ta-script-require-fix
Fix Require Path

GitOrigin-RevId: 1525890bd24520d8715cfbc8d617c545ef199314
2022-01-28 09:03:32 +00:00
Jakob Ackermann
cfaec97a3d Merge pull request #6393 from overleaf/ta-backfill-user-properties
Backfill User Properties

GitOrigin-RevId: ea2ffeaaf71d5ce41c76a1bfb2f0014006ef0d08
2022-01-26 09:03:06 +00:00
Tim Alby
bbac46156b convert price_in_unit to price_in_cents
GitOrigin-RevId: bae030e9c90f8286d6e6550744849984fe81f63d
2022-01-21 09:03:29 +00:00
Tim Alby
3e70546e18 rename price attributes to price_in_cents or price_in_unit
GitOrigin-RevId: 8045472c96862078583fcb522099ad78926281dc
2022-01-21 09:03:23 +00:00
lawshe
212430e430 Run script on primary
GitOrigin-RevId: 655191d2948ce3a1cfedc4e660965ed90c0371ba
2022-01-14 09:03:23 +00:00
Jessica Lawshe
e8a4a88e87 Merge pull request #6238 from overleaf/jel-script-remove-email
[web] Script to remove email

GitOrigin-RevId: c8f1a69259904b08ef39181b8b7e9c3150ea59f0
2022-01-13 09:04:22 +00:00
Thomas
5e61fce3b4 Enable additional currencies when purchasing (or upgrading to) a group plan (#4884)
* Add script to fetch group data pricing from Recurly

* Update groups pricing data using script to fetch prices from Recurly

* Add additional currencies to saas settings

* Refactor group plans upgrade modal to use shared options from settings

GitOrigin-RevId: 6d13d5b152d01e0399f9d2b8f6f8bf99784589e8
2022-01-12 09:03:21 +00:00
Alf Eaton
50df230846 [web] Upgrade Prettier to match version in monorepo root (#6231)
GitOrigin-RevId: 02f97af1b9704782eee77a0b7dfc477ada23e34d
2022-01-11 09:03:23 +00:00
Brian Gough
e7f040ecf7 Merge pull request #6116 from overleaf/bg-remove-large-broken-docs
[web] allow large broken docs to be deleted

GitOrigin-RevId: 0322f55fcc5448ec1d6e6ee96056b80980bd3406
2021-12-14 09:03:12 +00:00
Thomas
ee08ace46b Merge pull request #6033 from overleaf/bg-add-recover-doc-script
[web] add script to recover dangling docs from redis

GitOrigin-RevId: 2fca3d6b27cb35c6ee6cb1f32588ab7390a63d3f
2021-12-09 09:02:32 +00:00
Thomas
abbacd71b7 Merge pull request #6025 from overleaf/tm-history-upgrade-fix-retry-failed
Fix for None without conversion to correctly retry failed upgrades and speed up mongo queries

GitOrigin-RevId: 22d2b936f478ee8395775ed258095f1bf647c88f
2021-12-09 09:02:29 +00:00
Thomas
cb6fc31225 Merge pull request #6017 from overleaf/tm-history-upgrade-v1-with-conversion
Add script for upgrading v1 projects requiring conversion

GitOrigin-RevId: 4f3cec528a0b9ad56db652d831052caa91e62521
2021-12-08 09:03:09 +00:00
Eric Mc Sween
b22df1dcba Merge pull request #5984 from overleaf/em-unnecessarily-async-functions
Clean up unnecessarily async functions

GitOrigin-RevId: 59f0f0a76b4436f3b99a09b747670d443bac4582
2021-12-07 09:03:33 +00:00
Thomas
be17e022a6 Merge pull request #5975 from overleaf/tm-history-upgrade-count-fails
Fix for counting upgrade failures in history counts script

GitOrigin-RevId: a679fc6e588fc236c31f32e3c27883f25b7f6249
2021-12-06 09:02:58 +00:00
Eric Mc Sween
993a6d0eb9 Merge pull request #5968 from overleaf/em-oversized-docs
Get path from Mongo when fixing oversized docs

GitOrigin-RevId: 07d5425d37faf935c162f57f63f6f1cf4c62d592
2021-12-02 09:03:20 +00:00
Thomas
88dabee6df Add options for controlling hint & retries to history upgrade scripts (#5967)
* Add USE_QUERY_HINT to allow configuring hint usage in history scripts

* Add RETRY_FAILED option to re-attempt previously failed history upgrades

* Add HistoryConversionFailed count to counts script

* Increase default batch size/concurrency on count script

GitOrigin-RevId: a498294719a504b224c04c95363bf098bb80b574
2021-12-02 09:03:10 +00:00
Eric Mc Sween
b9c8627d6a Merge pull request #5957 from overleaf/em-fix-oversized-docs
Add script for fixing oversized docs

GitOrigin-RevId: 513ce326884e00530182d3272a9be1134e1fb1f5
2021-12-01 09:03:16 +00:00
Thomas
40b087fee8 Merge pull request #5952 from overleaf/tm-batched-update-ranges
Add BATCH_RANGE_END(/BATCH_RANGE_START) env vars for batchedUpdate scripts

GitOrigin-RevId: e74f30368194584a6fb398963e0c04f850a8b31d
2021-12-01 09:03:09 +00:00
Eric Mc Sween
76e5d90084 Merge pull request #5915 from overleaf/em-delete-dangling-refs
Add a script for deleting dangling doc and file refs

GitOrigin-RevId: 9de5576e96a6585e72a642324b94744fc605d739
2021-11-26 09:03:33 +00:00
Eric Mc Sween
bcd64d333f Merge pull request #5888 from overleaf/tm-history-upgrade-improve-logging
Prevent unnecessary extra batch, and add a 'continueFrom' helper for BATCH_LAST_ID

GitOrigin-RevId: d6832c40bbed2c27676f4b72d720938707847bfc
2021-11-24 09:03:17 +00:00
Eric Mc Sween
9cf622e013 Merge pull request #5877 from overleaf/tm-history-upgrade-none-with-conversion
Add script for converting and upgrading from SL history to full project history

GitOrigin-RevId: 0e1ad19d3f5cd248ef30e2a0fbb69711cb307b6e
2021-11-24 09:03:13 +00:00
Jakob Ackermann
2261e761f4 Merge pull request #5705 from overleaf/jpa-node-14
[misc] upgrade node version from 12 to 14

GitOrigin-RevId: 15c465c7bb5e42b0c71e2dedb09cf4fe9f1d8ec6
2021-11-19 09:02:56 +00:00
Thomas
302a6fddc8 Merge pull request #5756 from overleaf/tm-history-batched-update-descending
Add BATCH_DESCENDING to reverse processing order of batchedUpdate

GitOrigin-RevId: fb6aff20713dfd8fe6c6a78b64505d96ce4bfb14
2021-11-12 09:02:53 +00:00
Thomas
5c5f42df1f Merge pull request #5752 from overleaf/tm-history-upgrade-failure-checks
Check for upgradeFailed before classifying/upgrading a project as v1

GitOrigin-RevId: 68776665762e87b640aab4c55a5e56062697912a
2021-11-12 09:02:49 +00:00
Thomas
ec36fe4b04 Merge pull request #5751 from overleaf/tm-history-upgrade-max-failures
Add configurable limit for number of failures (stop when reached)

GitOrigin-RevId: 56f0bf1d2e803851d68918b26f06d3b5834d7cc0
2021-11-12 09:02:45 +00:00
Eric Mc Sween
5fc6d7dcb3 Merge pull request #5740 from overleaf/em-gcp-logging-web
Improve GCP logging for web

GitOrigin-RevId: b304c87a3fe46c29189f665eb3daf22c23d6eb8f
2021-11-11 09:03:09 +00:00
Jakob Ackermann
6122520bf5 Merge pull request #5727 from overleaf/jpa-deprecation-warnings
[misc] fix deprecation warnings

GitOrigin-RevId: aa103252e5918143bb1dacb19e87e47bb1784e83
2021-11-09 09:04:44 +00:00
Thomas
97a636b0dd Set force/origin params in project history migration script (None types), handle errors (#5693)
* Use a force resync when initialising full project history, improve error handling, increase default mongo timeout

* Don't remove history ID if error on initialisation

* Rename MAX_PROJECT_UPGRADES to MAX_UPGRADES_TO_ATTEMPT and skip upgrades in the current batch once we reach the limit

* Catch SIGINT and wait for a safe time to exit

* Set overleaf.history.upgradeFailed when errors during history initialisation

GitOrigin-RevId: 2c987926cac9c9727a7b39e9003aa8626d56423f
2021-11-09 09:04:37 +00:00
Thomas
bfda92513a Merge pull request #5694 from overleaf/tm-history-scripts-mongo-timeouts
Update v1 without preserveHistory, increase default mongo timeouts, add count query hint

GitOrigin-RevId: bfe1a0024258d0c75646544b9646928b2afe33c1
2021-11-09 09:04:30 +00:00
Jakob Ackermann
9f45f786cf Merge pull request #5627 from overleaf/jpa-use-mongo-secondary-for-script
[web] scripts: check_institution_users: run mongo queries on secondaries

GitOrigin-RevId: 490592cff926f91f1e24ea907016ddbc03a45f60
2021-11-03 09:03:21 +00:00
Eric Mc Sween
e5676a9643 Merge pull request #5648 from overleaf/em-revert-gcp-logging-web
Revert "Improve GCP logging for web"

GitOrigin-RevId: 92d446baf62108da1df92146eec12a2fe69d30ee
2021-11-02 09:03:29 +00:00
Eric Mc Sween
641b10cceb Merge pull request #5632 from overleaf/em-gcp-logging-web
Improve GCP logging for web

GitOrigin-RevId: 1198fab2e821a55563058171cfa435605216e337
2021-11-02 09:03:22 +00:00
Thomas
560e07fa8e Rename and rework script for counting project history states (#5593)
* Rename and rework script for counting project history states

GitOrigin-RevId: a00e4626f09526a0af79f71eb66910259895d0fb
2021-10-29 08:04:08 +00:00
Brian Gough
3c780c65e8 Merge pull request #5417 from overleaf/hb-restore-doc-from-admin
Restore soft deleted docs from admin

GitOrigin-RevId: 5c94539ae950c401225d2cfe7c0bc978ed258e22
2021-10-26 08:03:31 +00:00
Brian Gough
51b42381bd Merge pull request #5551 from overleaf/bg-node-upgrade-user-facing
upgrade node to v12.22.7 (user facing)

GitOrigin-RevId: ddc6a29beac27fe1ae5d88830fb901667d91ec89
2021-10-25 08:03:02 +00:00
Timothée Alby
735f79ab6a Merge pull request #5364 from overleaf/ta-split-test-assignment-date-backfill
Fix SplitTests assignedAt Type

GitOrigin-RevId: 1711f8672fb8e1525780f869b847117a66ca86ed
2021-10-22 08:04:49 +00:00
Jakob Ackermann
7996f90c7b Merge pull request #5306 from overleaf/jpa-clear-institution-notifications
[web] add a new script for clearing institution notifications

GitOrigin-RevId: d102b484c4fb9816832b48c2dfa66953bc996667
2021-10-21 08:03:25 +00:00
Brian Gough
acc9a1ace1 Merge pull request #5468 from overleaf/bg-fix-feature-override-script
fix feature override script

GitOrigin-RevId: f123843e1ed40b90f55a32d687a2ade4a5b44a05
2021-10-19 08:03:04 +00:00
Brian Gough
d2c76b05cf Merge pull request #5425 from overleaf/bg-add-feature-override-script
add feature override script

GitOrigin-RevId: 90def174b4ac182b6f62984e8f9621f3dc16b92d
2021-10-14 08:03:18 +00:00
Thomas
d984e3d826 Project history upgrade script for None without SL history (#4814)
GitOrigin-RevId: 604fb8a8193b798be1a342af5f08c004eee5521b
2021-10-08 08:03:00 +00:00
June Kelly
49ac6e2e6b Merge pull request #4929 from overleaf/jk-fix-disconnect-users
Fix /disconnectAllUsers endpoint security

GitOrigin-RevId: 57858daa5a076c37332bc575e76ffd6b1a1bd914
2021-09-27 08:02:57 +00:00
Thomas
3361ccfec1 Merge pull request #5123 from overleaf/tm-history-script-await-fix
Add missing await in history scripts

GitOrigin-RevId: 992e6748bc270845282853db6ec1a7aa496115ea
2021-09-24 08:04:08 +00:00
Eric Mc Sween
0f7bfe9173 Merge pull request #5087 from overleaf/em-promisify-subscription-updater
Promisify FeaturesUpdater and SubscriptionHandler

GitOrigin-RevId: 1a9725afa119c0eaee3d975a11197b6f702f1307
2021-09-21 08:03:10 +00:00
Hugh O'Brien
f7900b474b Merge pull request #4799 from overleaf/hb-eslint-rules
Re-enable some eslint rules

GitOrigin-RevId: 16153adb839bb61784bb40fbc8e43da281fe090d
2021-09-15 08:03:43 +00:00
Thomas
deca6f1f93 Add script to upgrade v1 project histories (if created after full project history enabled) (#4712)
GitOrigin-RevId: b329b83ae4167c3c58b947936d6a460f6f2b4327
2021-08-27 08:03:46 +00:00
June Kelly
af9a3d4fb7 Merge pull request #4818 from overleaf/ab-clean-example-project-split-test
Cleanup example project split test and set variant as new template

GitOrigin-RevId: 6d023233077b856f0f9a755eb1a0b60b66b4335f
2021-08-20 08:03:09 +00:00
Jakob Ackermann
75a602ec29 Merge pull request #4813 from overleaf/jpa-debug-non-pro
[web] check_institution_users: add option for debugging non pro users

GitOrigin-RevId: 11743e10a8be567028611d7e109c0450b08e11fc
2021-08-19 08:03:02 +00:00
Eric Mc Sween
b2e6eaf936 Merge pull request #4805 from overleaf/em-cleanup-expired-projects
Limit cleanup script to expired projects

GitOrigin-RevId: 49ea2c08cee92f027f21e3e8b07bf9491a9f089f
2021-08-19 08:02:49 +00:00
Eric Mc Sween
91e3f89154 Merge pull request #4796 from overleaf/em-cleanup-expired-projects
Script to clean up incorrectly expired projects

GitOrigin-RevId: e87860410c747385d76b4826fb38b58cb30e4973
2021-08-18 08:03:00 +00:00
Jakob Ackermann
99a414f345 Merge pull request #4656 from overleaf/jpa-rewrite-quotes-in-locales
[misc] rewrite single quote to left/right single quotation mark in locales

GitOrigin-RevId: a021fb6841425555b9af79a9146820299cb93fc2
2021-08-17 08:04:49 +00:00
Jakob Ackermann
7dc6456dca Merge pull request #4685 from overleaf/jpa-translations-sync
[misc] update translations sync for monorepo

GitOrigin-RevId: 794a9192212f7b63c040a08c42a1e9c6b3341609
2021-08-13 12:59:12 +00:00
Thomas
e25d8b1440 Merge pull request #4381 from overleaf/tm-history-upgrade-batched-update-hints
Extend batchedUpdate to accept find() options, and use a hint in upgrade script query to suggest mongo uses the _id index

GitOrigin-RevId: 7115f84d8be0c78ccb443051e911c931bf4aa0de
2021-08-05 02:08:07 +00:00
June Kelly
99fe2eca51 Merge pull request #4352 from overleaf/sk-add-ce-sp-migration-deleted-files
Add migrations for CE/SP, run scripts for deleted files and docs

GitOrigin-RevId: e425a8d929a4aefdc6f61cff636fb5a1b4c67dce
2021-08-04 11:13:55 +00:00
Thomas
ebc80fed8a Add script to upgrade v1 project histories (if no SL history) (#4364)
* Add script to upgrade v1 project histories (if no SL history)

GitOrigin-RevId: 997308eec2ed09be4d9d203cb746ca8ac8c88e23
2021-08-04 02:05:35 +00:00
nate stemen
7e61fc4035 Merge pull request #4330 from overleaf/ns-update-confirmedAt_strings
migrate confirmedAt strings to date types

GitOrigin-RevId: 5e8bde9b52b6696ed89a34ce58f00f31a921a57a
2021-07-28 02:07:11 +00:00
Jessica Lawshe
9df283caef Merge pull request #4334 from overleaf/jel-check-institution-users
Change check_institution_users.js output

GitOrigin-RevId: c331d5312dc807fd5118f4ce78737bde04a82c66
2021-07-28 02:07:03 +00:00
Thomas
b03a4cf7fc Add script to count project history states (#4328)
GitOrigin-RevId: 9f5fce9e162140579841cdad8a2ebb168dde72af
2021-07-28 02:06:24 +00:00
Jakob Ackermann
22aad599ba Merge pull request #4308 from overleaf/bg-allow-creating-projects-with-old-history
add script to create projects with sharelatex history

GitOrigin-RevId: bc5eae5d16cc65fca60b9155b35b7f5e2c663870
2021-07-14 12:40:47 +00:00
Jakob Ackermann
5e773ce950 Merge pull request #4101 from overleaf/ae-settings-module
Migrate from `settings-sharelatex` to `@overleaf/settings`

GitOrigin-RevId: 9a298ba26382180c1351683c5fddc9004418c1e6
2021-07-08 02:08:28 +00:00
Alexandre Bourdin
40c7f2dae1 Merge pull request #4219 from overleaf/ab-group-subscription-user-property
Send group subscription user property

GitOrigin-RevId: d1033ab4e0b5061b9d4a781e319d6b690f7e6154
2021-07-06 02:05:54 +00:00
Eric Mc Sween
e6b805b885 Merge pull request #4242 from overleaf/ho-paypal-script-exit-code
exit with non zero code when no invoicess were processed

GitOrigin-RevId: df449964fc830f689d972d9ad3ed6b352c1b7c5c
2021-07-03 02:09:17 +00:00
Jessica Lawshe
d3cc3edf4e Merge pull request #4146 from overleaf/jel-em-script-must-reconfirm
Add script to clear users' sessions and set must_reconfirm

GitOrigin-RevId: 87f85613c6eaf66298eb48e3ddb8eed12d73dd3e
2021-06-04 02:08:40 +00:00
Jakob Ackermann
7338560899 Merge pull request #4106 from overleaf/ta-sync-user-entitlement-lean
Reduce Memory Footprint of Sync User Entitlements Script

GitOrigin-RevId: 673ea76f8af9e5be6ff99b8e340414a434c203f4
2021-06-01 02:05:34 +00:00
Jakob Ackermann
26dbae7cef Merge pull request #4078 from overleaf/em-restore-deleted-docs
Fix restore_soft_deleted_docs script

GitOrigin-RevId: c21ea407ed9f6fb969b36d5452f38e446eff1c8b
2021-05-22 02:05:50 +00:00
Jessica Lawshe
9b29fa7cbc Merge pull request #4035 from overleaf/jel-reconfirmation-dropbox-notification
Notification for Dropbox unlinked due to reconfirmation lapse

GitOrigin-RevId: 03d2bed922e1d3dd993f9227b8e7675af42eda4b
2021-05-19 02:06:06 +00:00
Timothée Alby
a82ccf9aec fix mongo sort argument (#4021)
GitOrigin-RevId: 639f31d5046b4df5f9f75f688cf73f3366232c31
2021-05-14 02:09:55 +00:00
Jessica Lawshe
29264061d8 Merge pull request #3987 from overleaf/jel-ukamf-script
Check if IdP metadata to hide set

GitOrigin-RevId: 7a30961730b21d512b55faf718e5fe97e15eb6ce
2021-05-12 02:09:58 +00:00
Jessica Lawshe
2bf126af68 Merge pull request #3993 from overleaf/jel-reconfirmation-script
Add script to refresh features for users not reconfirmed

GitOrigin-RevId: d49f496dc6f1997763d54c6d8f41f7c3634b8b2d
2021-05-12 02:09:51 +00:00
Hugh O'Brien
903c1110e0 Merge pull request #3998 from overleaf/jpa-learn-sanitize
[learn] sanitize the wiki content

GitOrigin-RevId: c114bbd94479e926c0621953fe9c03f6d380a19d
2021-05-08 02:10:06 +00:00
Miguel Serrano
f9871103bf Merge pull request #3949 from overleaf/msm-reenable-eslint-const-rule
Reenable eslint `prefer-const` rule

GitOrigin-RevId: 4f3825be8b8dff381095209085a36eaab76260d5
2021-05-06 02:09:14 +00:00
Jakob Ackermann
cf496e1fd2 Merge pull request #3958 from overleaf/jpa-script-delete-orphaned-docs-online
[scripts] add a script for deleting orphaned docs

GitOrigin-RevId: f3b16d900cc162852491bd7a83fe1ba61a0579d8
2021-04-29 02:09:29 +00:00
Alf Eaton
1be43911b4 Merge pull request #3942 from overleaf/prettier-trailing-comma
Set Prettier's "trailingComma" setting to "es5"

GitOrigin-RevId: 9f14150511929a855b27467ad17be6ab262fe5d5
2021-04-28 02:10:01 +00:00
Jakob Ackermann
58fbbf6269 Merge pull request #3925 from overleaf/jpa-cache-deleted-project
[scripts] back_fill_dummy_doc_meta: add a cache for deletedProjects

GitOrigin-RevId: 3d24c9fc4985f33b2e18f8f63f0b690d65476d1b
2021-04-21 02:09:23 +00:00
Timothée Alby
5520553e34 Merge pull request #3877 from overleaf/jpa-script-regenerate-referreal-ids-optimize-queries
[scripts] regenerate_duplicate_referral_ids: optimize queries, add tests

GitOrigin-RevId: 5b6881b857b20a80bc8db6e01fb7668dc0377675
2021-04-20 02:09:59 +00:00
Jakob Ackermann
e47237f350 Merge pull request #3915 from overleaf/jpa-script-back-fill-dummy-doc-meta
[scripts] back_fill_dummy_doc_meta: bug fixes and limit result size

GitOrigin-RevId: 6823cf626ba7e0e6733a317866512745bb1e5206
2021-04-16 02:05:36 +00:00
Jakob Ackermann
70841f4b3b Merge pull request #3907 from overleaf/jpa-script-back-fill-dummy-doc-meta
[scripts] add a new script for back filling dummy doc meta data

GitOrigin-RevId: d3cb0900f08d4d3264cb1e8a0b3f7e8acdd6eb6c
2021-04-16 02:05:21 +00:00
Alf Eaton
1ebc8a79cb Merge pull request #3495 from overleaf/ae-prettier-2
Upgrade Prettier to v2

GitOrigin-RevId: 85aa3fa1acb6332c4f58c46165a43d1a51471f33
2021-04-15 02:05:22 +00:00
Alasdair Smith
d7542e60c3 Merge pull request #3895 from overleaf/ta-delete-subscriptions-script
Add Script to Delete Subscriptions

GitOrigin-RevId: fb8eda38f89c897cbd4c6d8bdcba19171b5914d3
2021-04-15 02:05:05 +00:00
Jakob Ackermann
ec7cd9fc3e Merge pull request #3656 from overleaf/jpa-script-back-fill-doc-name
[scripts] add new script for back filling the names of deleted docs

GitOrigin-RevId: c3a7ad8ba1306728bc1a433bec5dc847651bf94d
2021-04-07 02:05:03 +00:00
Shane Kilkelly
9c38d41652 Merge pull request #3872 from overleaf/jpa-batched-update-work-around-mongo-bug
[scripts] work around broken .setReadPreference() on mongo cursor

GitOrigin-RevId: 127c0593f4c20e45acb15ec26b45a45d9449d9ba
2021-04-02 02:04:56 +00:00
Shane Kilkelly
ae212feec4 Merge pull request #3701 from overleaf/jpa-script-back-fill-deleted-files-stage-2
[scripts] back_fill_deleted_files: optionally fix partial inserts

GitOrigin-RevId: 7d48d311db1af0b38222725ca86cdba8951b16b3
2021-04-02 02:04:52 +00:00
Alexandre Bourdin
973e6f31d7 Merge pull request #3871 from overleaf/ab-referral-id-script-timeout
Increase timeout for initial query of referral ID generation script

GitOrigin-RevId: f60d67ed8a8862c771a1dc33332230d73145ae51
2021-04-01 02:05:58 +00:00
Eric Mc Sween
c2f16621db Merge pull request #3803 from overleaf/ab-regenerate-duplicate-referral-ids-script
Add script to regenerate duplicate referral IDs

GitOrigin-RevId: cbcd7027f8dc342140ca5c22ed20c7814561e118
2021-04-01 02:05:49 +00:00
Alexandre Bourdin
b8fc4b58ca Merge pull request #3741 from overleaf/ta-refresh-institution-users
Refresh Institution Users Script Changes

GitOrigin-RevId: 917287450ba30a9f8b605a2d38933a0f6e1979e6
2021-03-11 03:05:21 +00:00
Jakob Ackermann
30cf22c8a9 Merge pull request #3678 from overleaf/jpa-back-fill-deleted-files-handle-duplicates
[scripts] back_fill_deleted_files: handle duplicate deleted files

GitOrigin-RevId: 3f2f1b662727d61d2da2800ad0d635b65562164b
2021-02-20 03:04:25 +00:00
Jakob Ackermann
6443e00e34 Merge pull request #3668 from overleaf/jpa-move-deleted-files
[scripts] add new script for back filling deletedFiles in own collection

GitOrigin-RevId: 82d48e60192ca90a7cd169b95d43187ef7febff5
2021-02-18 03:04:59 +00:00
Thomas
204117fcd1 Use safe characters in filenames when restoring documents (#3659)
* [admin-panel] Change format of restored snapshot filenames

* [scripts] Change format of restored soft-deleted filenames

GitOrigin-RevId: b928c4237150b38842aa1f2c8f43ffb7eca677b1
2021-02-17 03:04:06 +00:00
Alasdair Smith
7cbf2cdd9e Merge pull request #3496 from overleaf/ae-eslint-dot-notation
Enable the eslint dot-notation rule

GitOrigin-RevId: e11cbad3e8a77a4a60590d3674fbf34feccc5bc9
2020-12-17 03:07:31 +00:00
Alf Eaton
2ff1cf43d6 Merge pull request #3470 from overleaf/eslint
Upgrade and configure ESLint

GitOrigin-RevId: ad5aeaf85e72c847a125ff3a9db99a12855e38aa
2020-12-16 03:08:28 +00:00
Timothée Alby
d5544f0626 Merge pull request #3406 from overleaf/timothee-sync-user-entitlements-doc
Update User Entitlements Sync Script README

GitOrigin-RevId: 0bcdc9c79ab4ca9229f38ab57d71019508b5792d
2020-11-27 03:04:59 +00:00
Shane Kilkelly
0450c52187 Merge pull request #3335 from overleaf/jpa-cmg-archived-script-logging
Update archiving script for re-run

GitOrigin-RevId: 0251ca8d6f864f697395deac9470398519b704de
2020-11-05 03:04:30 +00:00
Jakob Ackermann
36f81a93b9 Merge pull request #3265 from overleaf/jpa-i18n-drop-html-from-vars
[misc] i18n: drop html from vars

GitOrigin-RevId: 3cf2aa5a70cc8710693c24bd4b65bddcd4ba09e8
2020-10-31 03:05:46 +00:00
Miguel Serrano
04c35c5a34 Merge pull request #3316 from overleaf/jpa-script-restore-soft-deleted-docs
[scripts] restore_soft_deleted_docs: port the script from the dev-manual

GitOrigin-RevId: e445cfad0d0f04275b3899c34b7963ddb29d4444
2020-10-28 03:04:39 +00:00
Miguel Serrano
f2eb4893fe Merge pull request #3315 from overleaf/jpa-i18n-transform-locales
[misc] i18n: transform locales

GitOrigin-RevId: 2306682eab2b10a69c14520cb22338d8537397cd
2020-10-28 03:04:33 +00:00
Jakob Ackermann
102a20931e Merge pull request #3310 from overleaf/jpa-validate-data-of-model-tweak-output
[scripts] validate-data-of-model: log after processing

GitOrigin-RevId: b9ab7989bf1b3af12469bbf8a0a82ad7c40e1f14
2020-10-23 02:04:44 +00:00
Jakob Ackermann
224c5a0f23 Merge pull request #3306 from overleaf/jpa-script-validate-data-of-model
[scripts] validate-data-of-model: add the new script

GitOrigin-RevId: c432598a1efee58e95f3751ac0f63113ec837344
2020-10-22 02:04:48 +00:00
Jakob Ackermann
5256572356 Merge pull request #3274 from overleaf/jpa-i18n-upload-non-english
[scripts/translations] uploadNonEnglish: automate upload of translations

GitOrigin-RevId: 0d4453d17702955abe15497c64cb693ff945fda8
2020-10-22 02:04:27 +00:00
Jakob Ackermann
01712f1229 Merge pull request #3307 from overleaf/jpa-i18n-fixes
[misc] i18n fixes

GitOrigin-RevId: 862acff0a96b3717f1410327d1dcc469268f5e30
2020-10-22 02:04:22 +00:00
Jakob Ackermann
403332d80d Merge pull request #3226 from overleaf/jpa-mongodb-native-scripts
[misc] migrate active scripts to the native mongo driver

GitOrigin-RevId: f3b441bc53754dc2f83ca24c3e57d2cc978dd7fe
2020-10-09 02:05:19 +00:00
Jakob Ackermann
cec854de89 Merge pull request #3225 from overleaf/jpa-scripts-cleanup
[misc] delete unneeded scripts

GitOrigin-RevId: 30b1c97dfde8d2e93b40c0df4cb8be9a963580ad
2020-10-09 02:05:14 +00:00
Jakob Ackermann
ad52f7dc01 Merge pull request #3255 from overleaf/jpa-fix-scripts
[misc] add waitForDb wrapper to scripts with indirect mongo access

GitOrigin-RevId: 009331f91a45f075a35b0b6e90c4352e55908c21
2020-10-06 02:04:28 +00:00
Jessica Lawshe
e8b4629320 Merge pull request #3244 from overleaf/jpa-locales-trailing-new-line
[misc] add a trailing new line to the downloaded locales files

GitOrigin-RevId: 5111ca1147b2ae355cc9db87c010536e3861a23c
2020-09-30 02:04:51 +00:00
Jessica Lawshe
2a3cb615ee Merge pull request #3241 from overleaf/jpa-speedup-acceptance-tests
[misc] speedup the ConvertArchivedState test suite

GitOrigin-RevId: e7d6471955aabbc6af76e27fdf23d97e2fd87901
2020-09-30 02:04:46 +00:00
Simon Detheridge
2efd33eae6 Merge pull request #3217 from overleaf/jpa-translations-upload
[misc] i18n: translations upload

GitOrigin-RevId: f4bc24c9a645cc3eb9ab004d98ab4cd89d3cdce2
2020-09-29 02:05:24 +00:00
Alasdair Smith
394f160679 Merge pull request #2963 from overleaf/cmg-archive-state-script
Script to convert old archived state into new array state

GitOrigin-RevId: 64cd3a236dc627f922488e1fa9d8aa2e7df1eb15
2020-09-27 02:05:32 +00:00
Jakob Ackermann
018a44eeb5 Merge pull request #3185 from overleaf/jpa-normalize-mongo-imports
[misc] normalize mongo imports

GitOrigin-RevId: ac653d9982e0d36736b90f4c03d4c00be88ea76a
2020-09-25 02:04:20 +00:00
Jakob Ackermann
435af75ef7 Merge pull request #3163 from overleaf/as-jpa-i18n-cleanup
[misc] Translations cleanup

GitOrigin-RevId: 46bf1142bb9415eeebf638c120597996aaa55f8b
2020-09-18 02:04:41 +00:00
Jessica Lawshe
bfb4da572b Merge pull request #3158 from overleaf/as-fix-react-replacement-tag-sanitisation
Fix stripping of "replacement" tags in translation strings for react-i18next

GitOrigin-RevId: a83ed2810689b00c85c34a47afc92462907fd5de
2020-09-05 02:05:17 +00:00
Jakob Ackermann
b61ab62efb Merge pull request #3120 from overleaf/jpa-batched-update-continue
[scripts] batchedUpdate: add support for passing in the tail of the log

GitOrigin-RevId: 50b573ec4f90026c3c2c660a5313fdd62817dbd9
2020-08-20 02:06:31 +00:00
Jakob Ackermann
00e59a9afe Merge pull request #3118 from overleaf/jpa-delay-mongo-connection-use
[scripts] batchedUpdate: try to work around flaky mongo connection setup

GitOrigin-RevId: 2bba7117b8f8892a41703569fef3f97d5e8d6835
2020-08-19 02:06:34 +00:00
Jakob Ackermann
fa594e575b Merge pull request #3113 from overleaf/jpa-translations-mono-repo
[misc] mono repo with translations

GitOrigin-RevId: 1ed86d211f6a2031aafc3e7462687af0e957f9fd
2020-08-19 02:06:08 +00:00
Jakob Ackermann
1f0ee8e1ca Merge pull request #3093 from overleaf/jpa-offline-migration-image-name
[scripts] add a script for back-filling the imageName into projects

GitOrigin-RevId: 150d2e53f99a4b3baee0df3e2036576c36c7db43
2020-08-18 02:06:28 +00:00
Jakob Ackermann
b5d3919911 Merge pull request #3092 from overleaf/jpa-batched-update
[scripts] add helper for batched updates on non-indexed fields

GitOrigin-RevId: d24c4ccfd9d112573ddf303655d4c8ac552f30a1
2020-08-18 02:06:23 +00:00
Shane Kilkelly
b982493e08 Merge pull request #3032 from overleaf/msm-added-user-find-projections-scripts
Deleted scripts no longer needed

GitOrigin-RevId: 822aef0dbea7f2e7f664cb939ed75c9c658c00f5
2020-08-10 15:54:22 +00:00
Timothée Alby
52fafa96c5 Merge pull request #3060 from overleaf/cmg-wfh-export-updates
WFH Export: Account for user being undefined

GitOrigin-RevId: 8e653fda6eaea3cdde8e5677f24ef39c1c97bb94
2020-08-10 15:54:00 +00:00
Chrystal Maria Griffiths
e7107b7a8e Merge pull request #3057 from overleaf/cmg-wfh-export-updates
Export deletedSubscriptions not subscriptions for WFH 2020

GitOrigin-RevId: 4f9c37da27240c616d185076ab14daa1438de375
2020-07-28 02:06:37 +00:00
Chrystal Maria Griffiths
064ecda24f Merge pull request #3050 from overleaf/cmg-wfh-export
Logging updates to WFH export script

GitOrigin-RevId: ac6b9f92fcabe62a591d22c4efdb161da2758473
2020-07-25 02:06:54 +00:00
Chrystal Maria Griffiths
a4f4617b03 Merge pull request #3048 from overleaf/cmg-wfh-export
Export user details from WFH 2020 subscriptions

GitOrigin-RevId: 4f9be9d2b6309f7766f2855b571b81fc40870081
2020-07-25 02:06:48 +00:00
Chrystal Maria Griffiths
05abdd18d7 Merge pull request #2935 from overleaf/cmg-covid-upgrades
Add script for WFH offer ending

GitOrigin-RevId: b9291824a0712740d5d40439f759eb8a7d11d9ca
2020-06-30 02:10:14 +00:00
Chrystal Maria Griffiths
9aa0ca1131 Merge pull request #2875 from overleaf/cmg-covid-upgrades-script
Create notifications for current WFH 2020 users

GitOrigin-RevId: f40ae373815d834cfa4c81bb96a61a799385b8d9
2020-06-03 10:31:15 +00:00
Eric Mc Sween
a0809e1d85 Merge pull request #2833 from overleaf/jpa-ns-replace-spellcheck-languages
[script] replace_spellcheck_lng: use projectIds as additional filter

GitOrigin-RevId: 8813dd883c81174b7078b6af7c1dd148381fce4e
2020-05-21 03:22:45 +00:00
Jessica Lawshe
cbba4132e1 Merge pull request #2821 from overleaf/jpa-ns-replace-spellcheck-languages
[script] add a script to replace all unsupported spell check languages

GitOrigin-RevId: 597033b7ae7733f8bc7e5e0f4dfb1a49d0cae3b4
2020-05-13 03:23:28 +00:00
Simon Detheridge
bbe9f9a620 Merge pull request #2798 from overleaf/spd-count-files
Add script to delete deleted-project data from filestore

GitOrigin-RevId: 9a2c5861edddf5ed26fc684257369fac4cf95475
2020-05-02 03:19:27 +00:00
Simon Detheridge
ff38ea9533 Handle missing projects properly in file-count script
GitOrigin-RevId: 5968fc3c6646a6e75b2b84440d59d9c0cbcead5e
2020-04-30 03:19:54 +00:00
Simon Detheridge
07cd6b257a Merge pull request #2787 from overleaf/spd-count-files
Update file-count script for projects with no deleted-files array

GitOrigin-RevId: 63b3af4f3c419ed032a6de8a90c680e1446ee422
2020-04-30 03:19:48 +00:00
Timothée Alby
130d21b122 Merge pull request #2776 from overleaf/spd-count-files
Add script to count files and docs in projects

GitOrigin-RevId: 8d5e80ee9d48912d07c0f4ed61398b1a3f1ac0f5
2020-04-29 03:21:58 +00:00
Jessica Lawshe
e45c9d6c10 Merge pull request #2775 from overleaf/ew-update-metadata-processor
update metadata processor to match recommended workflow

GitOrigin-RevId: ecce921a1451e4ab544b437691cdde4356ae1804
2020-04-28 03:21:58 +00:00
Ersun Warncke
9d12d98855 report/sync on mongo/postgres entitlment mismatches
GitOrigin-RevId: 71258d5d7ca1b6700d70546f2c3be672f5524bef
2020-04-02 03:19:48 +00:00
nate stemen
d717ebb2e0 Merge pull request #2676 from overleaf/ew-check-sso-cert-expirations
show expiration data and throw on date errors when loading certs

GitOrigin-RevId: d81c96c722f0ce20352f2ef9a346b6d9bfa028d1
2020-03-19 04:16:59 +00:00
Eric Mc Sween
d772dbaceb Merge pull request #2673 from overleaf/ta-resync-subscriptions-fix
Resync Recurly Subscriptions Script Improvements

GitOrigin-RevId: b042465b7bffcbb73b40d1a7f23de784185d53ef
2020-03-17 04:18:03 +00:00
Timothée Alby
50ccc90815 Merge pull request #2664 from overleaf/ta-resync-subscriptions
Add Script To Resync Recurly Subscriptions

GitOrigin-RevId: 95f1263e5b3b782ec70d3d135f3c1866548a048f
2020-03-12 04:18:56 +00:00
Jessica Lawshe
a433235310 Merge pull request #2643 from overleaf/jel-affiliations-cron-job
Ensure affiliations cron job

GitOrigin-RevId: 4ac6f8b29b1e1460d627a86172fcdf1fa27a59a8
2020-03-12 04:18:47 +00:00
Timothée Alby
6734d9e107 Merge pull request #2641 from overleaf/ew-delete-orphaned-docs
Process and Script to Delete Orphaned Docs

GitOrigin-RevId: 0c428e36973a9131e3d379fdf4657e802576b23d
2020-03-10 04:14:46 +00:00
Timothée Alby
bb722f3bff Merge pull request #2628 from overleaf/jel-backfill-sso
Add script to backfill SSO affiliations

GitOrigin-RevId: 5dc6678531311871b09fd79ed96f45f718753ad5
2020-02-29 04:17:27 +00:00
Simon Detheridge
cae6cf6efa Merge pull request #2592 from overleaf/jel-html-inst-table-script
Add script to generate institution row in list

GitOrigin-RevId: 8dfb7396626c229ff2a7e9441a3fa5ae247d06bb
2020-02-19 04:20:51 +00:00
Ersun Warncke
aadfcc89a8 remove scripts that are no longer used
GitOrigin-RevId: 3f6c69d856bb16e56759b7947b099293163c4615
2020-01-31 04:16:53 +00:00
Timothée Alby
850d5f957c Merge pull request #2480 from overleaf/ta-refresh-features-script-improve
Refresh Features Script Improvements

GitOrigin-RevId: 1cd0fc3b689cf85760d9a22804bf9cab19e22409
2020-01-08 04:17:47 +00:00
Timothée Alby
30b9ba4ac7 Merge pull request #2452 from overleaf/ta-refresh-features-script-extra
Improve Script To Refresh All Users' Features

GitOrigin-RevId: f13fe0b01a7c26eca950ff8a008c937232769417
2019-12-17 04:22:37 +00:00
Timothée Alby
8d6e72bd8f Merge pull request #2446 from overleaf/ta-refresh-features-script-fix
Script To Refresh All Users' Features Fix

GitOrigin-RevId: 545c68e6fd868bd50baf27e8e9e987bbeaf72732
2019-12-10 08:25:14 +00:00
Jessica Lawshe
1a91b5d65c Merge pull request #2442 from overleaf/ew-check-saml-beta-on-login
use samlBeta flag to test university with sso_enabled=false

GitOrigin-RevId: 3f0dc09b23f5e7814ba78af148685a6a07e30242
2019-12-09 15:24:11 +00:00
Timothée Alby
5783f99fbd Merge pull request #2439 from overleaf/ta-refresh-features-script
Add Script To Refresh All Users' Features

GitOrigin-RevId: 3ec107d170af7d65b7fe5bf90598e18d738bfad5
2019-12-06 04:19:12 +00:00
Ersun Warncke
91c4cf16cc extract correct entity id for ukamf metadata
GitOrigin-RevId: 4cb1d7f6e5636bbed77c4279d7d7704ab9b9ab77
2019-11-27 19:16:19 +00:00
Timothée Alby
508556c835 Merge pull request #2409 from overleaf/ta-recurly-collection-script-fix
Recurly Collection Script Fix

GitOrigin-RevId: 3012d06a9122636ca1997e2e66899a36b386e5be
2019-11-27 13:21:27 +00:00
Eric Mc Sween
df6d0625f1 Merge pull request #2368 from overleaf/ew-ukamf-metadata-processor-cli
ukamf metadata processor cli

GitOrigin-RevId: f823a1dca231546f3ab67c47f6443e56b50e30d1
2019-11-21 13:00:28 +00:00
Timothée Alby
e000fd4615 Merge pull request #2343 from overleaf/ta-invoice-attempt-callback
Collect Past Due Invoices on Paypal Billing Info Updates

GitOrigin-RevId: 6a0d298db8589ae6ba7cb62e4dfd562a1f292db0
2019-11-12 09:14:58 +00:00
Timothée Alby
480ca112ff Merge pull request #2277 from overleaf/ta-recurly-script-rate-limit
Recurly Script Rate Limit

GitOrigin-RevId: 726580a821daf3b3dc9c49f6739b79ddcae451b8
2019-10-22 12:07:10 +00:00
Timothée Alby
de4205d6a0 Merge pull request #2273 from overleaf/ta-recurly-get-accounts
Add Script to Print CSV of all Paypal Customers

GitOrigin-RevId: 3aab5a29508a6848934a2858e0ce0edb9c7d6e71
2019-10-21 14:08:03 +00:00
Alasdair Smith
9cf73f965c Merge pull request #1440 from overleaf/as-amd-webpack
Bundle all frontend code with webpack

GitOrigin-RevId: 1bd93dad516c456fe1649193868e841e20459b0b
2019-10-16 10:36:21 +00:00
Eric Mc Sween
33d1f603df Merge pull request #2226 from overleaf/spd-clearprojectokens
Add script to clear tokens from a specific project

GitOrigin-RevId: a810e2b7fe2e34efb937bffc0e39c409076daa23
2019-10-14 13:38:07 +00:00
Brian Gough
d376047c20 Merge pull request #2222 from overleaf/bg-invalidate-tokens
invalidate tokens

GitOrigin-RevId: b8a65846d2b671f7f7b8a2ab75f76bb8255bd73b
2019-10-10 11:39:18 +00:00
Simon Detheridge
11ce07ec50 Merge pull request #1999 from overleaf/spd-migrations
Add database migrations using 'east'

GitOrigin-RevId: da067292e9db1fad050545858bc7cc39245d3395
2019-10-01 12:09:58 +00:00
Eric Mc Sween
a10cfcddd5 Merge pull request #2169 from overleaf/em-upgrade-texlive
Upgrade some projects to TeX Live 2018

GitOrigin-RevId: e5e56058e43b788657e89c44834633e75bbd78e7
2019-09-26 12:56:14 +00:00
Simon Detheridge
cf22393dff Merge pull request #2018 from overleaf/spd-handle-undefined-in-deletedproject
Handle 'undefined' values when creating DeletedProject objects

GitOrigin-RevId: 1d34d3b44feb50fd5501b1c35f06f62c0170b861
2019-07-26 15:41:37 +00:00
Simon Detheridge
d7bee9a7d8 Merge pull request #2014 from overleaf/spd-deleted-project-collab-ids
Store and backfill collaborator and overleaf history IDs in deleted projects

GitOrigin-RevId: 34950e29d6910c22f1f6f153f8035a96a1ea8360
2019-07-26 14:39:18 +00:00
Simon Detheridge
bf740f1e25 Merge pull request #1959 from overleaf/spd-integration-soft-deletion
Integration: Merge soft-deletion features into master
GitOrigin-RevId: 83baf730be2f256ad0d02271600392fda144b761
2019-07-18 14:34:22 +00:00
nate stemen
9cc5dc968c Merge pull request #1957 from overleaf/ns-decaf-cleanup
.../js/... -> .../src/...

GitOrigin-RevId: ab509c633529440f05247d19c320ebb77d506768
2019-07-11 18:55:42 +00:00
Ersun Warncke
aec0ea5b08 remove sharelatex auth
GitOrigin-RevId: 7c72b7f80ff0b15d994423f552c67359cac03634
2019-06-19 11:42:15 +00:00
Simon Detheridge
93386bcb8c Merge pull request #1859 from overleaf/spd-sl-user-password-copy
Copy old SL hashed passwords to a new field

GitOrigin-RevId: 28e7ff57e8753a1e887c54e9ed63cb17984e2fd4
2019-06-18 08:46:14 +00:00
Simon Detheridge
321d66f804 Merge pull request #1869 from overleaf/ns-uprade-task-decaf-bug
.../js/... -> .../src/...

GitOrigin-RevId: d93cc4c34010ea7b318778a456e59bd702faa739
2019-06-17 15:14:18 +00:00
Simon Detheridge
7e1b4195c5 Merge pull request #1875 from overleaf/sk-fix-multi-script
Fix the password-removal script, pass the `multi` flag to update

GitOrigin-RevId: 753f0911304cfe02e97e03e2e018a826c176e780
2019-06-17 15:13:57 +00:00
Simon Detheridge
4b0a445337 Merge pull request #1876 from overleaf/spd-cleanup-stubs-no-user
Handle user stubs with no user in cleanup script

GitOrigin-RevId: 810134f0876bc595f2d749921929b52dae4e7958
2019-06-17 15:13:48 +00:00
Ersun Warncke
b46d855487 backing account creation fixes: (#1866)
* fix requires for decaf
* add error handling for missing v1 profile
* truncate names
* create random password for users without password

GitOrigin-RevId: 0efc4b742d9295a83e126b1df1d4ce2700d7a333
2019-06-14 09:48:49 +00:00
Timothée Alby
e659703745 Merge pull request #1842 from overleaf/ta-remove-v1-sync
Remove v1 Sync on Features Refresh

GitOrigin-RevId: a99e0a74c4fc503bf81d0b847b3f331b3228e24f
2019-06-11 13:34:11 +00:00
Jessica Lawshe
f0e39f7a86 Merge pull request #1847 from overleaf/spd-cleanup-userstubs
Add user-stub cleanup script

GitOrigin-RevId: 3a1dab4aeec74fe5d42732db52737d880a86002e
2019-06-06 15:48:43 +00:00
Simon Detheridge
02c4edcb1c Merge pull request #1780 from overleaf/sk-script-remove-password-fields
Add a script to remove `hashedPassword` fields from non-sl user records

GitOrigin-RevId: d7c6fdbc138d4c5452e6e3a7f2ad639f049f122f
2019-05-20 12:18:40 +00:00
Simon Detheridge
6a45be9ccd Merge pull request #1773 from overleaf/ew-create-backing-accounts-for-sl-users
Create backing accounts for sl users

GitOrigin-RevId: d7400ace3d26b7f5e3314ba2a9dcbbb32edc424a
2019-05-16 10:59:48 +00:00
Timothée Alby
7e32ed5158 Merge pull request #1766 from overleaf/ta-dropbox-duplicates-script
Add Script to Unlink all Duplicate Dropbox uids

GitOrigin-RevId: 6db73dee9f04e9006d0aec558cf370b5079df671
2019-05-15 07:29:00 +00:00
Ersun Warncke
8377005187 Revert "Revert "oauth and collabratec migration""
This reverts commit c8814e7fd85776feb37bf8fad95038349b36cd9a.

GitOrigin-RevId: 9deeb445917c856acee54ef793575c8ab9c81304
2019-05-14 10:24:04 +00:00
Ersun Warncke
89ee728514 Revert "oauth and collabratec migration"
This reverts commit 4ac63921b030a01ed79bc0da1666d3c9f9545248.

GitOrigin-RevId: c8814e7fd85776feb37bf8fad95038349b36cd9a
2019-05-13 15:52:30 +00:00
Ersun Warncke
935877222a oauth and collabratec migration
* make v2 system of record for collabratec id
* migrate oauth apps, tokens to v2
* set collabratec id on reg/link from ctec
* copy collabratec id from user stub to user on merge

GitOrigin-RevId: 4ac63921b030a01ed79bc0da1666d3c9f9545248
2019-05-13 12:04:56 +00:00