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

Commit 03279b4

Browse files
committed
Add v3.42.0
1 parent 78c3d7e commit 03279b4

File tree

11 files changed

+88
-63
lines changed

11 files changed

+88
-63
lines changed

core/built/assets/ghost-dark-9b73c63e8c4a883e90722dbba9296d21.css renamed to core/built/assets/ghost-dark-6a8fa036f9b8ce0d00181f5a036211ea.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/built/assets/ghost.min-d180f21ff7052c2a18291a5f2a697b4b.js renamed to core/built/assets/ghost.min-d951f28f0eba6a36d25d773dd84d66ae.js

Lines changed: 23 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/built/assets/ghost.min-3563275270ed0091bcb2206b133c67bc.css renamed to core/built/assets/ghost.min-f4e9818fc51df5ceba7516cebece5752.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/server/api/canary/config.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ module.exports = {
1010
permissions: false,
1111
query() {
1212
const billingUrl = config.get('host_settings:billing:enabled') ? config.get('host_settings:billing:url') : '';
13+
const domainUrl = config.get('host_settings:domain:enabled') ? config.get('host_settings:domain:url') : '';
14+
const updateUrl = config.get('host_settings:update:enabled') ? config.get('host_settings:update:url') : '';
1315
const response = {
1416
version: ghostVersion.full,
1517
environment: config.get('env'),
@@ -26,6 +28,13 @@ module.exports = {
2628
if (billingUrl) {
2729
response.billingUrl = billingUrl;
2830
}
31+
if (domainUrl) {
32+
response.domainUrl = domainUrl;
33+
}
34+
if (updateUrl) {
35+
response.updateUrl = updateUrl;
36+
}
37+
2938
return response;
3039
}
3140
}

core/server/api/v3/config.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ module.exports = {
1010
permissions: false,
1111
query() {
1212
const billingUrl = config.get('host_settings:billing:enabled') ? config.get('host_settings:billing:url') : '';
13+
const domainUrl = config.get('host_settings:domain:enabled') ? config.get('host_settings:domain:url') : '';
14+
const updateUrl = config.get('host_settings:update:enabled') ? config.get('host_settings:update:url') : '';
1315
const response = {
1416
version: ghostVersion.full,
1517
environment: config.get('env'),
@@ -26,6 +28,13 @@ module.exports = {
2628
if (billingUrl) {
2729
response.billingUrl = billingUrl;
2830
}
31+
if (domainUrl) {
32+
response.domainUrl = domainUrl;
33+
}
34+
if (updateUrl) {
35+
response.updateUrl = updateUrl;
36+
}
37+
2938
return response;
3039
}
3140
}

core/server/services/members/middleware.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ const loadMemberSession = async function (req, res, next) {
2020
res.locals.member = req.member;
2121
next();
2222
} catch (err) {
23-
logging.warn(err.message);
2423
Object.assign(req, {member: null});
2524
next();
2625
}
@@ -32,7 +31,6 @@ const getIdentityToken = async function (req, res) {
3231
res.writeHead(200);
3332
res.end(token);
3433
} catch (err) {
35-
logging.warn(err.message);
3634
res.writeHead(err.statusCode);
3735
res.end(err.message);
3836
}
@@ -44,7 +42,6 @@ const deleteSession = async function (req, res) {
4442
res.writeHead(204);
4543
res.end();
4644
} catch (err) {
47-
logging.warn(err.message);
4845
res.writeHead(err.statusCode);
4946
res.end(err.message);
5047
}
@@ -59,7 +56,6 @@ const getMemberData = async function (req, res) {
5956
res.json(null);
6057
}
6158
} catch (err) {
62-
logging.warn(err.message);
6359
res.writeHead(err.statusCode);
6460
res.end(err.message);
6561
}
@@ -81,7 +77,6 @@ const updateMemberData = async function (req, res) {
8177
res.json(null);
8278
}
8379
} catch (err) {
84-
logging.warn(err.message);
8580
res.writeHead(err.statusCode);
8681
res.end(err.message);
8782
}

core/server/web/admin/views/default-prod.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<title>Ghost Admin</title>
99

1010

11-
<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" />
11+
<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" />
1212

1313
<meta name="HandheldFriendly" content="True" />
1414
<meta name="MobileOptimized" content="320" />
@@ -34,7 +34,7 @@
3434

3535

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

3939

4040

@@ -53,7 +53,7 @@
5353

5454

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

5858
</body>
5959
</html>

core/server/web/admin/views/default.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<title>Ghost Admin</title>
99

1010

11-
<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" />
11+
<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" />
1212

1313
<meta name="HandheldFriendly" content="True" />
1414
<meta name="MobileOptimized" content="320" />
@@ -34,7 +34,7 @@
3434

3535

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

3939

4040

@@ -53,7 +53,7 @@
5353

5454

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

5858
</body>
5959
</html>

core/shared/logging.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ module.exports = logging({
1111
transports: config.get('logging:transports'),
1212
gelf: config.get('logging:gelf'),
1313
loggly: config.get('logging:loggly'),
14+
elasticsearch: config.get('logging:elasticsearch'),
1415
rotation: config.get('logging:rotation')
1516
});

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ghost",
3-
"version": "3.41.9",
3+
"version": "3.42.0",
44
"description": "The professional publishing platform",
55
"author": "Ghost Foundation",
66
"homepage": "https://ghost.org",
@@ -49,7 +49,7 @@
4949
"@tryghost/errors": "0.2.7",
5050
"@tryghost/helpers": "1.1.37",
5151
"@tryghost/image-transform": "1.0.3",
52-
"@tryghost/job-manager": "0.8.0",
52+
"@tryghost/job-manager": "0.8.1",
5353
"@tryghost/kg-card-factory": "2.1.5",
5454
"@tryghost/kg-default-atoms": "2.0.2",
5555
"@tryghost/kg-default-cards": "3.1.0",
@@ -91,7 +91,7 @@
9191
"express-query-boolean": "2.0.0",
9292
"express-session": "1.17.1",
9393
"fs-extra": "9.1.0",
94-
"ghost-ignition": "4.4.3",
94+
"ghost-ignition": "4.5.4",
9595
"ghost-storage-base": "0.0.4",
9696
"glob": "7.1.6",
9797
"got": "9.6.0",

0 commit comments

Comments
 (0)