0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-06 22:40:14 -05:00
-----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQTqYa7kNs8D7Oo9dgLSEYbwtHKVrQUCYK/iogAKCRDSEYbwtHKV
 rcgCAP9qagl5CtrgE1mLx7fs+W+yy+UOslBqhR/o49aOQMTEbAD/ajcR5w2qv/mW
 GRK0qr9boWPcQm6YpiuEQ9j4SYMoCQU=
 =p+5B
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQTqYa7kNs8D7Oo9dgLSEYbwtHKVrQUCYK/jPgAKCRDSEYbwtHKV
 rcEgAQDh43UkCDj/rg3jxMeItspMXwnwrg+ZpscgoeCdm4nFKAD/UtsJCrma4+j8
 if2jOddYUy4xAAPUMwhpwsRJVMkWbgY=
 =gtbT
 -----END PGP SIGNATURE-----

Merged v4.6.4 into main

v4.6.4
This commit is contained in:
Daniel Lockyer 2021-05-27 19:21:44 +01:00
commit b98e0b0bbb
3 changed files with 3 additions and 3 deletions

@ -1 +1 @@
Subproject commit 8909ee2b829387569bd45831965ae500fdf6b874
Subproject commit 13fc1c7005f3d6c17f324bef7fe9204f62d6a891

View file

@ -74,7 +74,7 @@ const membersService = {
}
} else {
const siteUrl = urlUtils.getSiteUrl();
if (!/^https/.test(siteUrl)) {
if (!/^https/.test(siteUrl) && membersConfig.isStripeConnected()) {
throw new Error('Cannot run Ghost without SSL when Stripe is connected. Please update your url config to use "https://"');
}
}

View file

@ -1,6 +1,6 @@
{
"name": "ghost",
"version": "4.6.3",
"version": "4.6.4",
"description": "The professional publishing platform",
"author": "Ghost Foundation",
"homepage": "https://ghost.org",