Merge branch 'hotfix/20.14.9' into merge/2024/hotfix/20.14.9

[ebijun]

• fix patch from GRDM-43663 Squashed commit of the following:

commit 0cd969a1c698cc5373fa29531026f988dcd60e3e Merge: 57bad122a2 50245580a5 Author: Matt Frazier maf7sm@virginia.edu Date: Tue Aug 11 14:49:50 2020 -0400

Merge branch 'hotfix/20.14.9'

commit 50245580a55cf4eba9055b9835eaab1192ef72e8 Author: Matt Frazier maf7sm@virginia.edu Date: Tue Aug 11 12:34:08 2020 -0400

Sniff preprints for SPAM iff public

commit 57bad122a2935f4ec1ecac7085a9149647f3ada5 Merge: b53cce5330 9b67df157f Author: Matt Frazier maf7sm@virginia.edu Date: Thu Aug 6 15:42:01 2020 -0400

Merge branch 'hotfix/20.14.8'

commit 9b67df157fa1466f88e5efc3e6d86850a684c10c Author: corbinSanders corbin@cos.io Date: Thu Aug 6 15:27:20 2020 -0400

Fix argparse args

commit b53cce5330ffba92ae14a392c44f6be0522a4d6e Merge: ee30dc5dee ba89ba1e5b Author: Matt Frazier maf7sm@virginia.edu Date: Thu Aug 6 14:45:59 2020 -0400

Merge branch 'hotfix/20.14.7'

commit ba89ba1e5b22dfcadb5aba1f8dfc343b092409a4 Author: corbinSanders corbin@cos.io Date: Thu Aug 6 14:43:20 2020 -0400

Email All users about new Terms of Service [ENG-2074]

closes #9453

commit ee30dc5dee48e9d21ebe9ee9e20bb24873794efd Merge: 0870ca9773 e02d0d4948 Author: Matt Frazier maf7sm@virginia.edu Date: Wed Jul 29 15:57:17 2020 -0400

Merge branch 'hotfix/20.14.6'

commit e02d0d4948c02da0c4b00ab51aeafe633a4b7a0f Author: longze chen cs.longze.chen@gmail.com Date: Wed Jul 29 15:47:20 2020 -0400

Fix a link in the description under the pu banner

commit 0870ca977372342bcf846e7ca8b7c61e33889690 Merge: 8ef4337944 14e31596ac Author: Matt Frazier maf7sm@virginia.edu Date: Wed Jul 29 14:48:20 2020 -0400

Merge branch 'hotfix/20.14.5'

commit 14e31596ace09bc7339d6ad73120acf54e5f62f6 Author: longze chen cs.longze.chen@gmail.com Date: Wed Jul 29 12:50:32 2020 -0400

Add princeton university to OSF institutions

commit 8ef4337944c8c7806b010a571ec5f7c1b0838a95 Merge: b77af591b1 3fafdc0659 Author: Matt Frazier maf7sm@virginia.edu Date: Wed Jul 29 11:41:21 2020 -0400

Merge branch 'hotfix/20.14.4'

commit 3fafdc0659177870ae745d9a31db7597ed2cfb6e Author: longze chen cs.longze.chen@gmail.com Date: Wed Jul 29 10:01:58 2020 -0400

Add the policy lab at brown university to OSF test server

commit b77af591b1a2b81ba8112c7108526afc51a6ab33 Merge: aeba90158e d9e8ed352b Author: Matt Frazier maf7sm@virginia.edu Date: Thu Jul 23 10:52:45 2020 -0400

Merge branch 'hotfix/20.14.3'

commit d9e8ed352b2dc112269cd7637e360e95e68a63db Author: corbinSanders 50155660+corbinSanders@users.noreply.github.com Date: Thu Jul 23 10:50:49 2020 -0400

Return Response object on Registration HAM

Closes #9439

Purpose

Mergeworks OSF 20.14.9 EMBER 20.7.1

Changes

QA Notes

• Does this change require a data migration? If so, what data will we migrate?
• What is the level of risk?
  • Any permissions code touched?
  • Is this an additive or subtractive change, other?
• How can QA verify? (Through UI, API, AdminApp or AdminAdminApp?)
  • If verifying through API, what's the new version? Please include the endpoints in PR notes or Dev docs.
• What features or workflows might this change impact?
• How will this impact performance? -->

Documentation

Side Effects

Ticket

Mergeworks OSF 20.14.9 EMBER 20.7.1

GRDM-43663

Merge branch RDM-osf.io/tree/merge/2024/hotfix/20.14.9 GRDM-43067

• fix patched GRDM-43663-2 from kajita@nagoya-u.jp (Shoji Kajita)

Tested on GRDM-44491

[ebijun]

Should not use Squashed commit.I'll remake it.