mirror of
https://github.com/yu-i-i/overleaf-cep.git
synced 2026-11-15 06:33:55 +01:00
Merge pull request #3942 from overleaf/prettier-trailing-comma
Set Prettier's "trailingComma" setting to "es5" GitOrigin-RevId: 9f14150511929a855b27467ad17be6ab262fe5d5
This commit is contained in:
@@ -34,10 +34,10 @@ module.exports = {
|
||||
res.render(Path.resolve(__dirname, '../views/user/activate'), {
|
||||
title: 'activate_account',
|
||||
email: user.email,
|
||||
token: req.query.token
|
||||
token: req.query.token,
|
||||
})
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
@@ -13,5 +13,5 @@ module.exports = {
|
||||
|
||||
webRouter.get('/user/activate', UserActivateController.activateAccountPage)
|
||||
AuthenticationController.addEndpointToLoginWhitelist('/user/activate')
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@ describe('UserActivateController', function () {
|
||||
this.user = {
|
||||
_id: (this.user_id = 'kwjewkl'),
|
||||
features: {},
|
||||
email: 'joe@example.com'
|
||||
email: 'joe@example.com',
|
||||
}
|
||||
|
||||
this.UserGetter = { getUser: sinon.stub() }
|
||||
@@ -22,14 +22,14 @@ describe('UserActivateController', function () {
|
||||
requires: {
|
||||
'../../../../app/src/Features/User/UserGetter': this.UserGetter,
|
||||
'../../../../app/src/Features/Errors/ErrorController': this
|
||||
.ErrorController
|
||||
}
|
||||
.ErrorController,
|
||||
},
|
||||
})
|
||||
this.req = {
|
||||
query: {},
|
||||
session: {
|
||||
user: this.user
|
||||
}
|
||||
user: this.user,
|
||||
},
|
||||
}
|
||||
this.res = {}
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user