From 08a35b8998ec5a8a567a6cda509bf5eceabc6ca3 Mon Sep 17 00:00:00 2001 From: Simon Detheridge Date: Mon, 27 Jan 2020 13:53:45 +0000 Subject: [PATCH] Merge pull request #2541 from overleaf/revert-2382-msm-remove-recaptcha-default-config Revert "Remove Recaptcha default config" GitOrigin-RevId: 70e5b7b1f52e89a676fc0cea3654fbe5f59739ce --- services/web/app/views/layout.pug | 3 ++- services/web/config/settings.defaults.coffee | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/services/web/app/views/layout.pug b/services/web/app/views/layout.pug index e92c81c37a..1f0406be89 100644 --- a/services/web/app/views/layout.pug +++ b/services/web/app/views/layout.pug @@ -1,3 +1,4 @@ + doctype html html( lang=(currentLngCode || 'en') @@ -80,7 +81,7 @@ html( body - if(settings.recaptcha) + if(settings.recaptcha && (settings.recaptcha.siteKey || settings.recaptcha.siteKeyV3)) if (settings.recaptcha.siteKeyV3) script(src="https://www.google.com/recaptcha/api.js?render="+settings.recaptcha.siteKeyV3) else diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee index 4a38ad5828..ae8ec33ffe 100644 --- a/services/web/config/settings.defaults.coffee +++ b/services/web/config/settings.defaults.coffee @@ -488,6 +488,11 @@ module.exports = settings = # Example: # header_extras: [{text: "Some Page", url: "http://example.com/some/page", class: "subdued"}] + recaptcha: + disabled: + invite: true + register: true + customisation: {} # templates: [{