Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ghost/admin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ghost-admin",
"version": "6.22.1",
"version": "6.23.0-rc.0",
"description": "Ember.js admin client for Ghost",
"author": "Ghost Foundation",
"homepage": "http://ghost.org",
Expand Down Expand Up @@ -228,4 +228,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
const {createAddColumnMigration} = require('../../utils');

module.exports = createAddColumnMigration('newsletters', 'show_share_button', {
type: 'boolean',
nullable: false,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

praise: love when a field is not nullable.

defaultTo: false
});
1 change: 1 addition & 0 deletions ghost/core/core/server/data/schema/schema.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ module.exports = {
show_comment_cta: {type: 'boolean', nullable: false, defaultTo: true},
show_subscription_details: {type: 'boolean', nullable: false, defaultTo: false},
show_latest_posts: {type: 'boolean', nullable: false, defaultTo: false},
show_share_button: {type: 'boolean', nullable: false, defaultTo: false},
background_color: {type: 'string', maxlength: 50, nullable: false, defaultTo: 'light'},
post_title_color: {type: 'string', maxlength: 50, nullable: true},
created_at: {type: 'dateTime', nullable: false},
Expand Down
1 change: 1 addition & 0 deletions ghost/core/core/server/models/newsletter.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ const Newsletter = ghostBookshelf.Model.extend({
show_comment_cta: true,
show_subscription_details: false,
show_latest_posts: false,
show_share_button: false,
background_color: 'light',
feedback_enabled: false,
show_excerpt: false,
Expand Down
2 changes: 1 addition & 1 deletion ghost/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ghost",
"version": "6.22.1",
"version": "6.23.0-rc.0",
"description": "The professional publishing platform",
"author": "Ghost Foundation",
"homepage": "https://ghost.org",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7112,7 +7112,7 @@ exports[`Members API Can subscribe to a newsletter 5: [headers] 1`] = `
Object {
"access-control-allow-origin": "http://127.0.0.1:2369",
"cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
"content-length": "5427",
"content-length": "5505",
"content-type": "application/json; charset=utf-8",
"content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/,
"etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/,
Expand Down
150 changes: 102 additions & 48 deletions ghost/core/test/e2e-api/admin/__snapshots__/newsletters.test.js.snap

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ghost/core/test/unit/server/data/schema/integrity.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const validateRouteSettings = require('../../../../../core/server/services/route
*/
describe('DB version integrity', function () {
// Only these variables should need updating
const currentSchemaHash = '0faf1ab8fe5d1582b21e8f828f718c9f';
const currentSchemaHash = '815cfa675a8b05467b6ae5653110ff92';
const currentFixturesHash = '4dcbd7b52bc9ce23e6f5f1673118ba73';
const currentSettingsHash = 'a102b80d2ab0cd92325ed007c94d7da6';
const currentRoutesHash = '3d180d52c663d173a6be791ef411ed01';
Expand Down
Loading