Skip to content
Permalink
Browse files

Merge train-143 into master

#2172
r=shane-tomlinson
  • Loading branch information...
philbooth committed Aug 13, 2019
2 parents 5029b8c + 79bbbb5 commit 9adbd6da4e15633b503c350bda05973c33836a90
@@ -1,3 +1,11 @@
## 1.143.4

No changes.

## 1.143.3

No changes.

## 1.143.2

No changes.

Some generated files are not rendered by default. Learn more.

@@ -1,6 +1,6 @@
{
"name": "fxa-auth-db-mysql",
"version": "1.143.2",
"version": "1.143.4",
"description": "MySQL backend for Firefox Accounts",
"main": "index.js",
"repository": {
@@ -1,3 +1,15 @@
## 1.143.4

### Bug fixes

- scripts: add missing mailer arg to verification reminder script (a2bd9a790)

## 1.143.3

### Bug fixes

- auth: remove extra `/lib` from require path (03708e47c)

## 1.143.2

No changes.

Some generated files are not rendered by default. Learn more.

@@ -1,6 +1,6 @@
{
"name": "fxa-auth-server",
"version": "1.143.2",
"version": "1.143.4",
"description": "Firefox Accounts, an identity provider for Mozilla cloud services",
"bin": {
"fxa-auth": "./bin/key_server.js"
@@ -40,19 +40,31 @@ run()
});

async function run() {
const [allReminders, db, templates, translator] = await Promise.all([
const [
allReminders,
db,
templates,
subscriptionTemplates,
translator,
] = await Promise.all([
verificationReminders.process(),
require(`${LIB_DIR}/db`)(config, log, {}, {}).connect(
config[config.db.backend]
),
require(`${LIB_DIR}/senders/templates`).init(),
require(`${LIB_DIR}/senders/subscription-templates`)(log),
require(`${LIB_DIR}/senders/translator`)(
config.i18n.supportedLanguages,
config.i18n.defaultLanguage
),
]);

const mailer = new Mailer(translator, templates, config.smtp);
const mailer = new Mailer(
translator,
templates,
subscriptionTemplates,
config.smtp
);

const sent = {};

@@ -1,3 +1,11 @@
## 1.143.4

No changes.

## 1.143.3

No changes.

## 1.143.2

### Other changes

Some generated files are not rendered by default. Learn more.

@@ -1,6 +1,6 @@
{
"name": "fxa-content-server",
"version": "1.143.2",
"version": "1.143.4",
"description": "Firefox Accounts Content Server",
"scripts": {
"build-production": "NODE_ENV=production grunt build",
@@ -1,3 +1,11 @@
## 1.143.4

No changes.

## 1.143.3

No changes.

## 1.143.2

No changes.

Some generated files are not rendered by default. Learn more.

@@ -1,6 +1,6 @@
{
"name": "fxa-customs-server",
"version": "1.143.2",
"version": "1.143.4",
"description": "Firefox Accounts Customs Server",
"author": "Mozilla (https://mozilla.org/)",
"license": "MPL-2.0",

Some generated files are not rendered by default. Learn more.

@@ -1,6 +1,6 @@
{
"name": "fxa-email-event-proxy",
"version": "1.143.2",
"version": "1.143.4",
"description": "Proxies events from Sendgrid to FxA SQS queues",
"main": "index.js",
"scripts": {
@@ -1,3 +1,11 @@
## 1.143.4

No changes.

## 1.143.3

No changes.

## 1.143.2

No changes.

Some generated files are not rendered by default. Learn more.

@@ -1,6 +1,6 @@
[package]
name = "fxa_email_service"
version = "1.143.2"
version = "1.143.4"
publish = false
edition = "2018"

Some generated files are not rendered by default. Learn more.

@@ -1,6 +1,6 @@
{
"name": "fxa-event-broker",
"version": "1.143.2",
"version": "1.143.4",
"description": "Firefox Accounts Event Broker",
"scripts": {
"build": "./node_modules/typescript/bin/tsc",

Some generated files are not rendered by default. Learn more.

@@ -1,6 +1,6 @@
{
"name": "fxa-payments-server",
"version": "1.143.2",
"version": "1.143.4",
"description": "Firefox Accounts Payments Service",
"scripts": {
"lint": "npm-run-all --parallel lint:*",
@@ -1,3 +1,11 @@
## 1.143.4

No changes.

## 1.143.3

No changes.

## 1.143.2

No changes.

Some generated files are not rendered by default. Learn more.

@@ -1,6 +1,6 @@
{
"name": "fxa-profile-server",
"version": "1.143.2",
"version": "1.143.4",
"private": true,
"description": "Firefox Accounts Profile service.",
"scripts": {

Some generated files are not rendered by default. Learn more.

@@ -1,6 +1,6 @@
{
"name": "fxa-support-panel",
"version": "1.143.2",
"version": "1.143.4",
"description": "Small app to help customer support access FxA details",
"directories": {
"test": "test"

0 comments on commit 9adbd6d

Please sign in to comment.
You can’t perform that action at this time.