Skip to content

Commit 9cc5fd1

Browse files
committed
Merge branch 'main' into develop
# Conflicts: # migrations/20221121094350_drop-hashtag-uniqueness.js # pages/_app.js # src/pages/organizations/[id]/maintenance.js
2 parents 369338f + 2ee9c1c commit 9cc5fd1

File tree

4 files changed

+22
-51
lines changed

4 files changed

+22
-51
lines changed

app/index.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,14 @@ app.use(boom())
3030
async function init() {
3131
await nextApp.prepare()
3232

33+
// On maintenance mode, render maintenance page
34+
if (process.env.MAINTENANCE_MODE === 'true') {
35+
app.get('/*', (req, res) => {
36+
return nextApp.render(req, res, '/maintenance')
37+
})
38+
return app
39+
}
40+
3341
/**
3442
* Sub apps init
3543
*/
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
exports.up = function (knex) {
2+
return knex.schema.alterTable('team', function (table) {
3+
table.dropUnique('hashtag')
4+
})
5+
}
6+
7+
exports.down = function (knex) {
8+
return knex.schema.alterTable('team', function (table) {
9+
table.unique('hashtag')
10+
})
11+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export default function MaintenancePage() {
2+
return <div>OSM Teams is under maintenance, please come back soon.</div>
3+
}

tracing.yml

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)