public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into access

Browse source 
Conflicts:
	test/e2e/lib/worker-counter.js
This commit is contained in:
Tomas Bures 2017-05-28 19:35:06 +02:00
commit cda93630ea
25 changed files with 798 additions and 335 deletions
Download patch file Download diff file Expand all files Collapse all files

2
setup/knex/migrations/20170506102634_base.js
View file

@ -38,7 +38,7 @@ exports.up = function(knex, Promise) {
// For now, we just check whether our DB is up-to-date based on the existing SQL migration infrastructure in Mailtrain.
return knex('settings').where({key: 'db_schema_version'}).first('value')
.then(row => {
if (!row || Number(row.value) !== 28) {
if (!row || Number(row.value) !== 29) {
throw new Error('Unsupported DB schema version: ' + row.value);
}
})