Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Commit

Permalink
Add v3.42.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@YannickRe
YannickRe committed Mar 4, 2021
1 parent 78c3d7e commit 03279b4
Show file tree
Hide file tree
Showing 11 changed files with 88 additions and 63 deletions.
2 changes: 1 addition & 1 deletion ...dark-9b73c63e8c4a883e90722dbba9296d21.css → ...dark-6a8fa036f9b8ce0d00181f5a036211ea.css
View file

Large diffs are not rendered by default.

41 changes: 23 additions & 18 deletions ...t.min-d180f21ff7052c2a18291a5f2a697b4b.js → ...t.min-d951f28f0eba6a36d25d773dd84d66ae.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ....min-3563275270ed0091bcb2206b133c67bc.css → ....min-f4e9818fc51df5ceba7516cebece5752.css
View file

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions core/server/api/canary/config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ module.exports = {
permissions: false,
query() {
const billingUrl = config.get('host_settings:billing:enabled') ? config.get('host_settings:billing:url') : '';
const domainUrl = config.get('host_settings:domain:enabled') ? config.get('host_settings:domain:url') : '';
const updateUrl = config.get('host_settings:update:enabled') ? config.get('host_settings:update:url') : '';
const response = {
version: ghostVersion.full,
environment: config.get('env'),
Expand All @@ -26,6 +28,13 @@ module.exports = {
if (billingUrl) {
response.billingUrl = billingUrl;
}
if (domainUrl) {
response.domainUrl = domainUrl;
}
if (updateUrl) {
response.updateUrl = updateUrl;
}

return response;
}
}
Expand Down
9 changes: 9 additions & 0 deletions core/server/api/v3/config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ module.exports = {
permissions: false,
query() {
const billingUrl = config.get('host_settings:billing:enabled') ? config.get('host_settings:billing:url') : '';
const domainUrl = config.get('host_settings:domain:enabled') ? config.get('host_settings:domain:url') : '';
const updateUrl = config.get('host_settings:update:enabled') ? config.get('host_settings:update:url') : '';
const response = {
version: ghostVersion.full,
environment: config.get('env'),
Expand All @@ -26,6 +28,13 @@ module.exports = {
if (billingUrl) {
response.billingUrl = billingUrl;
}
if (domainUrl) {
response.domainUrl = domainUrl;
}
if (updateUrl) {
response.updateUrl = updateUrl;
}

return response;
}
}
Expand Down
5 changes: 0 additions & 5 deletions core/server/services/members/middleware.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ const loadMemberSession = async function (req, res, next) {
res.locals.member = req.member;
next();
} catch (err) {
logging.warn(err.message);
Object.assign(req, {member: null});
next();
}
Expand All @@ -32,7 +31,6 @@ const getIdentityToken = async function (req, res) {
res.writeHead(200);
res.end(token);
} catch (err) {
logging.warn(err.message);
res.writeHead(err.statusCode);
res.end(err.message);
}
Expand All @@ -44,7 +42,6 @@ const deleteSession = async function (req, res) {
res.writeHead(204);
res.end();
} catch (err) {
logging.warn(err.message);
res.writeHead(err.statusCode);
res.end(err.message);
}
Expand All @@ -59,7 +56,6 @@ const getMemberData = async function (req, res) {
res.json(null);
}
} catch (err) {
logging.warn(err.message);
res.writeHead(err.statusCode);
res.end(err.message);
}
Expand All @@ -81,7 +77,6 @@ const updateMemberData = async function (req, res) {
res.json(null);
}
} catch (err) {
logging.warn(err.message);
res.writeHead(err.statusCode);
res.end(err.message);
}
Expand Down
6 changes: 3 additions & 3 deletions core/server/web/admin/views/default-prod.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<title>Ghost Admin</title>


<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%2F%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%223.41%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%2F%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%223.42%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />

<meta name="HandheldFriendly" content="True" />
<meta name="MobileOptimized" content="320" />
Expand All @@ -34,7 +34,7 @@


<link rel="stylesheet" href="assets/vendor.min-5f3241a89eba4699965f4f257ab2e40a.css">
<link rel="stylesheet" href="assets/ghost.min-3563275270ed0091bcb2206b133c67bc.css" title="light">
<link rel="stylesheet" href="assets/ghost.min-f4e9818fc51df5ceba7516cebece5752.css" title="light">



Expand All @@ -53,7 +53,7 @@


<script src="assets/vendor.min-1ea21c7abed44258b1662cf1b103c007.js"></script>
<script src="assets/ghost.min-d180f21ff7052c2a18291a5f2a697b4b.js"></script>
<script src="assets/ghost.min-d951f28f0eba6a36d25d773dd84d66ae.js"></script>

</body>
</html>
6 changes: 3 additions & 3 deletions core/server/web/admin/views/default.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<title>Ghost Admin</title>


<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%2F%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%223.41%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%2F%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%223.42%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />

<meta name="HandheldFriendly" content="True" />
<meta name="MobileOptimized" content="320" />
Expand All @@ -34,7 +34,7 @@


<link rel="stylesheet" href="assets/vendor.min-5f3241a89eba4699965f4f257ab2e40a.css">
<link rel="stylesheet" href="assets/ghost.min-3563275270ed0091bcb2206b133c67bc.css" title="light">
<link rel="stylesheet" href="assets/ghost.min-f4e9818fc51df5ceba7516cebece5752.css" title="light">



Expand All @@ -53,7 +53,7 @@


<script src="assets/vendor.min-1ea21c7abed44258b1662cf1b103c007.js"></script>
<script src="assets/ghost.min-d180f21ff7052c2a18291a5f2a697b4b.js"></script>
<script src="assets/ghost.min-d951f28f0eba6a36d25d773dd84d66ae.js"></script>

</body>
</html>
1 change: 1 addition & 0 deletions core/shared/logging.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ module.exports = logging({
transports: config.get('logging:transports'),
gelf: config.get('logging:gelf'),
loggly: config.get('logging:loggly'),
elasticsearch: config.get('logging:elasticsearch'),
rotation: config.get('logging:rotation')
});
6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ghost",
"version": "3.41.9",
"version": "3.42.0",
"description": "The professional publishing platform",
"author": "Ghost Foundation",
"homepage": "https://ghost.org",
Expand Down Expand Up @@ -49,7 +49,7 @@
"@tryghost/errors": "0.2.7",
"@tryghost/helpers": "1.1.37",
"@tryghost/image-transform": "1.0.3",
"@tryghost/job-manager": "0.8.0",
"@tryghost/job-manager": "0.8.1",
"@tryghost/kg-card-factory": "2.1.5",
"@tryghost/kg-default-atoms": "2.0.2",
"@tryghost/kg-default-cards": "3.1.0",
Expand Down Expand Up @@ -91,7 +91,7 @@
"express-query-boolean": "2.0.0",
"express-session": "1.17.1",
"fs-extra": "9.1.0",
"ghost-ignition": "4.4.3",
"ghost-ignition": "4.5.4",
"ghost-storage-base": "0.0.4",
"glob": "7.1.6",
"got": "9.6.0",
Expand Down
64 changes: 35 additions & 29 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -402,19 +402,19 @@
resolved "https://registry.yarnpkg.com/@tryghost/bootstrap-socket/-/bootstrap-socket-0.2.5.tgz#9cb42e2287a57e6132b0a98b21ce36c034cffeb2"
integrity sha512-h4+rwCwszj5ozih57P0W8NjrN9rit6VuuMfLpSUrpbVmRpWcrvmg3JXhlSyqhe/HjHmPA3wNuqLiMLmN8H/VAA==

"@tryghost/[email protected]":
version "0.0.7"
resolved "https://registry.yarnpkg.com/@tryghost/bunyan-rotating-filestream/-/bunyan-rotating-filestream-0.0.7.tgz#3957de91e4e9b58999f0bbe19242080543dcfc4a"
integrity sha512-dswM+dxG8J7WpVoSjzAdoWXqqB5Dg0C2T7Zh6eoUvl5hkA8yWWJi/fS4jNXlHF700lWQ0g8/t+leJ7SGSWd+aw==
dependencies:
long-timeout "^0.1.1"

"@tryghost/[email protected]":
version "0.1.4"
resolved "https://registry.yarnpkg.com/@tryghost/constants/-/constants-0.1.4.tgz#7b185227fcad0aaa33d02abc9ba629adc8190039"
integrity sha512-lFbfNU8jNPUxLQcxXXYzVFZMclJ4fcFoMuhed63xld/DoistWIRrI/dePEYNymG9nbYhDk/4szwdwGJE8ZURIg==

"@tryghost/elasticsearch-bunyan@^0.1.0":
version "0.1.0"
resolved "https://registry.yarnpkg.com/@tryghost/elasticsearch-bunyan/-/elasticsearch-bunyan-0.1.0.tgz#cb66b2eba0c5e5970645b4548e2a41b1ce7a33cc"
integrity sha512-Qg/6JfMU5l5+dWJDuXLTrq4CIzucIeZ2H3bH5cOY6Yp+rLqBAADhRzAdlwL6s2Ab/X7/156Ljl58Ik+dpsgWRQ==
dependencies:
"@elastic/elasticsearch" "^7.10.0"

"@tryghost/elasticsearch-bunyan@^0.1.1":
"@tryghost/[email protected]", "@tryghost/elasticsearch-bunyan@^0.1.1":
version "0.1.1"
resolved "https://registry.yarnpkg.com/@tryghost/elasticsearch-bunyan/-/elasticsearch-bunyan-0.1.1.tgz#5a36d81dd020825dd563b1357ae6c249580c46f5"
integrity sha512-ILhumzdwJNoRG44S0FkgzZQlkCYioTKWEiY+FFFQpTFWwZ3Jd5a6us5k8tEsd+Wf2rZOvul/ehV45j2c2l1BMw==
Expand Down Expand Up @@ -472,13 +472,13 @@
optionalDependencies:
sharp "0.25.4"

"@tryghost/[email protected].0":
version "0.8.0"
resolved "https://registry.yarnpkg.com/@tryghost/job-manager/-/job-manager-0.8.0.tgz#b3e042b7dd6746d8e9e44b71c95d7e2ec75e2881"
integrity sha512-fXgyYaIw0ol99Kr1Nq0DDAH6sbgjIbUxQNsciQPPaUBqfPjdHEhRvrO+PD60nTAM1mZi74BnvCPJwoKAFMy6KA==
"@tryghost/[email protected].1":
version "0.8.1"
resolved "https://registry.yarnpkg.com/@tryghost/job-manager/-/job-manager-0.8.1.tgz#adb28f0922b3767fe9480cbb08a370fc51d1a5ae"
integrity sha512-nhty5xuDxQUYpCFV9HJTAc2N8TMCApRbDO1TZOBZW3mCNjg7BulSpk7KhHaEFoeOc+xYtBU9Dh/uIPST/3dwMg==
dependencies:
"@breejs/later" "4.0.2"
bree "4.1.1"
bree "6.2.0"
cron-validate "1.4.2"
fastq "1.10.1"
p-wait-for "3.2.0"
Expand Down Expand Up @@ -1461,10 +1461,10 @@ braces@~3.0.2:
dependencies:
fill-range "^7.0.1"

bree@4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/bree/-/bree-4.1.1.tgz#a29371d45adfb21225885e23030fa708c18da8eb"
integrity sha512-jTCqlI0Ll4pYxLoSdpv3lndY3++Ksgqq40bdtTNyufNVBpFzJNSXuL7/iEv2257MleprKJw28SIK8YhJpLBlJg==
bree@6.2.0:
version "6.2.0"
resolved "https://registry.yarnpkg.com/bree/-/bree-6.2.0.tgz#c785596d4a682148bc2fb708802c3f7eb1ef5d9d"
integrity sha512-8Ol69LQXeLUSgkRWiA1VXpK4+eYax6Qb6oL0Z2d3a57gJGuYRiJE0aqmprXOirlEdSyTKMDXys393u85XDlQfQ==
dependencies:
"@babel/runtime" "^7.12.5"
"@breejs/later" "^4.0.2"
Expand Down Expand Up @@ -4123,12 +4123,12 @@ [email protected]:
prettyjson "1.2.1"
uuid "8.3.2"

[email protected].3:
version "4.4.3"
resolved "https://registry.yarnpkg.com/ghost-ignition/-/ghost-ignition-4.4.3.tgz#c837ab11e1f3a1cfd22cc24df6b506a9afc1bc25"
integrity sha512-eViE/ae+AGV/YmVbTq2W5TBWVu724EUJ0pjtSwa4q6o1+fXxMIqoELJaxMX+Gc9PBK0nI3J+E0JI8GdrEiqndg==
[email protected].4:
version "4.4.4"
resolved "https://registry.yarnpkg.com/ghost-ignition/-/ghost-ignition-4.4.4.tgz#6d16912a733a21582680d859de3a1dff868d4c67"
integrity sha512-tYWDirmtBtTq2etRr2co7n1PPhyoeVIHZhPfG7NDIH5GUDZ8QYlCmxC8nlhy3nnDve5ZunDAg0FlA3Rjqa0kug==
dependencies:
"@tryghost/elasticsearch-bunyan" "^0.1.0"
"@tryghost/elasticsearch-bunyan" "^0.1.1"
bunyan "1.8.15"
bunyan-loggly "1.4.2"
caller "1.0.1"
Expand All @@ -4143,12 +4143,13 @@ [email protected]:
prettyjson "1.2.1"
uuid "8.3.2"

ghost-ignition@4.4.4:
version "4.4.4"
resolved "https://registry.yarnpkg.com/ghost-ignition/-/ghost-ignition-4.4.4.tgz#6d16912a733a21582680d859de3a1dff868d4c67"
integrity sha512-tYWDirmtBtTq2etRr2co7n1PPhyoeVIHZhPfG7NDIH5GUDZ8QYlCmxC8nlhy3nnDve5ZunDAg0FlA3Rjqa0kug==
ghost-ignition@4.5.4:
version "4.5.4"
resolved "https://registry.yarnpkg.com/ghost-ignition/-/ghost-ignition-4.5.4.tgz#09e90721b6df04af048f89f696a7af92e0ab4dfe"
integrity sha512-Ab9r4zFNqqWmcYoF3sFAY7IJCi5LUTz1KrwfpOEL4BVZEBF2HfzZ8Px2JVxDpmSRMmyHKmN1h/xjXfj+IT2hxA==
dependencies:
"@tryghost/elasticsearch-bunyan" "^0.1.1"
"@tryghost/bunyan-rotating-filestream" "0.0.7"
"@tryghost/elasticsearch-bunyan" "0.1.1"
bunyan "1.8.15"
bunyan-loggly "1.4.2"
caller "1.0.1"
Expand All @@ -4157,7 +4158,7 @@ [email protected]:
fs-extra "9.1.0"
gelf-stream "1.1.1"
json-stringify-safe "5.0.1"
lodash "4.17.20"
lodash "4.17.21"
moment "2.27.0"
nconf "0.10.0"
prettyjson "1.2.1"
Expand Down Expand Up @@ -6060,6 +6061,11 @@ [email protected], lodash@^4.17.20, lodash@~4.17.20:
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==

[email protected]:
version "4.17.21"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==

[email protected]:
version "4.0.0"
resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920"
Expand All @@ -6077,7 +6083,7 @@ logd-console-output@^1.2.1:
ee-types "^2.2.0"
glob "^7.1.2"

long-timeout@~0.1.1:
long-timeout@^0.1.1, long-timeout@~0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/long-timeout/-/long-timeout-0.1.1.tgz#9721d788b47e0bcb5a24c2e2bee1a0da55dab514"
integrity sha1-lyHXiLR+C8taJMLivuGg2lXatRQ=
Expand Down

0 comments on commit 03279b4

Please sign in to comment.