Merge pull request #12972 from mozilla/main-uplift-train-232

Main uplift train 232
mozilla · May 20, 2022 · 1fa9d96 · 1fa9d96
2 parents ef93639 + 4c8f0b4
commit 1fa9d96
Show file tree

Hide file tree

Showing 29 changed files with 249 additions and 15 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -25,7 +25,6 @@ bini11
 Brandon Ebersohl
 Brian Warner
 byrw
-César Carruitero
 championshuttler
 Chiamaka-Uzuegbu
 Chris Heilmann
@@ -35,6 +34,7 @@ ckarlof
 Claas Augner
 claubatista
 Cronus1007
+César Carruitero
 Dan Callahan
 Dan Schomburg
 Danny Amey

diff --git a/packages/fxa-admin-panel/CHANGELOG.md b/packages/fxa-admin-panel/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 1.232.5
+
+No changes.
+
+## 1.232.4
+
+No changes.
+
+## 1.232.3
+
+No changes.
+
+## 1.232.2
+
+No changes.
+
 ## 1.232.1
 
 ### Bug fixes

diff --git a/packages/fxa-admin-panel/package.json b/packages/fxa-admin-panel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fxa-admin-panel",
-  "version": "1.232.1",
+  "version": "1.232.5",
   "description": "FxA Admin Panel",
   "scripts": {
     "build-postcss": "postcss src/styles/tailwind.css -o src/styles/tailwind.out.css",

diff --git a/packages/fxa-admin-server/CHANGELOG.md b/packages/fxa-admin-server/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 1.232.5
+
+No changes.
+
+## 1.232.4
+
+No changes.
+
+## 1.232.3
+
+No changes.
+
+## 1.232.2
+
+No changes.
+
 ## 1.232.1
 
 ### Bug fixes

diff --git a/packages/fxa-admin-server/package.json b/packages/fxa-admin-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fxa-admin-server",
-  "version": "1.232.1",
+  "version": "1.232.5",
   "description": "FxA GraphQL Admin Server",
   "scripts": {
     "prebuild": "rimraf dist",

diff --git a/packages/fxa-auth-server/CHANGELOG.md b/packages/fxa-auth-server/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 1.232.5
+
+No changes.
+
+## 1.232.4
+
+No changes.
+
+## 1.232.3
+
+No changes.
+
+## 1.232.2
+
+No changes.
+
 ## 1.232.1
 
 No changes.

diff --git a/packages/fxa-auth-server/package.json b/packages/fxa-auth-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fxa-auth-server",
-  "version": "1.232.1",
+  "version": "1.232.5",
   "description": "Firefox Accounts, an identity provider for Mozilla cloud services",
   "bin": {
     "fxa-auth": "./bin/key_server.js"

diff --git a/packages/fxa-content-server/CHANGELOG.md b/packages/fxa-content-server/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 1.232.5
+
+No changes.
+
+## 1.232.4
+
+No changes.
+
+## 1.232.3
+
+No changes.
+
+## 1.232.2
+
+No changes.
+
 ## 1.232.1
 
 No changes.

diff --git a/packages/fxa-content-server/package.json b/packages/fxa-content-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fxa-content-server",
-  "version": "1.232.1",
+  "version": "1.232.5",
   "description": "Firefox Accounts Content Server",
   "scripts": {
     "build": "tsc --build ../fxa-react && NODE_ENV=production grunt build",

diff --git a/packages/fxa-customs-server/CHANGELOG.md b/packages/fxa-customs-server/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 1.232.5
+
+No changes.
+
+## 1.232.4
+
+No changes.
+
+## 1.232.3
+
+No changes.
+
+## 1.232.2
+
+No changes.
+
 ## 1.232.1
 
 No changes.

diff --git a/packages/fxa-customs-server/package.json b/packages/fxa-customs-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fxa-customs-server",
-  "version": "1.232.1",
+  "version": "1.232.5",
   "description": "Firefox Accounts Customs Server",
   "author": "Mozilla (https://mozilla.org/)",
   "license": "MPL-2.0",

diff --git a/packages/fxa-event-broker/CHANGELOG.md b/packages/fxa-event-broker/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Change history
 
+## 1.232.5
+
+No changes.
+
+## 1.232.4
+
+No changes.
+
+## 1.232.3
+
+No changes.
+
+## 1.232.2
+
+No changes.
+
 ## 1.232.1
 
 No changes.

diff --git a/packages/fxa-event-broker/package.json b/packages/fxa-event-broker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fxa-event-broker",
-  "version": "1.232.1",
+  "version": "1.232.5",
   "description": "Firefox Accounts Event Broker",
   "scripts": {
     "audit": "npm audit --json | audit-filter --nsp-config=.nsprc --audit=-",

diff --git a/packages/fxa-geodb/CHANGELOG.md b/packages/fxa-geodb/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Change history
 
+## 1.232.5
+
+No changes.
+
+## 1.232.4
+
+No changes.
+
+## 1.232.3
+
+No changes.
+
+## 1.232.2
+
+No changes.
+
 ## 1.232.1
 
 No changes.

diff --git a/packages/fxa-geodb/package.json b/packages/fxa-geodb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fxa-geodb",
-  "version": "1.232.1",
+  "version": "1.232.5",
   "description": "Firefox Accounts GeoDB Repo for Geolocation based services",
   "main": "lib/fxa-geodb.js",
   "directories": {

diff --git a/packages/fxa-graphql-api/CHANGELOG.md b/packages/fxa-graphql-api/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 1.232.5
+
+No changes.
+
+## 1.232.4
+
+No changes.
+
+## 1.232.3
+
+No changes.
+
+## 1.232.2
+
+No changes.
+
 ## 1.232.1
 
 No changes.

diff --git a/packages/fxa-graphql-api/package.json b/packages/fxa-graphql-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fxa-graphql-api",
-  "version": "1.232.1",
+  "version": "1.232.5",
   "description": "FxA GraphQL API",
   "scripts": {
     "prebuild": "rimraf dist",

diff --git a/packages/fxa-payments-server/CHANGELOG.md b/packages/fxa-payments-server/CHANGELOG.md
@@ -1,5 +1,27 @@
 # Change history
 
+## 1.232.5
+
+No changes.
+
+## 1.232.4
+
+No changes.
+
+## 1.232.3
+
+No changes.
+
+## 1.232.2
+
+### Bug fixes
+
+- payments: rename url variables Because: ([739cf06988](https://github.com/mozilla/fxa/commit/739cf06988))
+
+### Other changes
+
+- payments: Missing markup in payment-confirm string ([b85e51f890](https://github.com/mozilla/fxa/commit/b85e51f890))
+
 ## 1.232.1
 
 No changes.

diff --git a/packages/fxa-payments-server/package.json b/packages/fxa-payments-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fxa-payments-server",
-  "version": "1.232.1",
+  "version": "1.232.5",
   "description": "Firefox Accounts Payments Service",
   "scripts": {
     "build-postcss": "postcss src/styles/tailwind.scss -o src/styles/tailwind.out.scss",

diff --git a/packages/fxa-profile-server/CHANGELOG.md b/packages/fxa-profile-server/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 1.232.5
+
+No changes.
+
+## 1.232.4
+
+No changes.
+
+## 1.232.3
+
+No changes.
+
+## 1.232.2
+
+No changes.
+
 ## 1.232.1
 
 No changes.

diff --git a/packages/fxa-profile-server/package.json b/packages/fxa-profile-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fxa-profile-server",
-  "version": "1.232.1",
+  "version": "1.232.5",
   "private": true,
   "description": "Firefox Accounts Profile service.",
   "scripts": {

diff --git a/packages/fxa-react/CHANGELOG.md b/packages/fxa-react/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 1.232.5
+
+No changes.
+
+## 1.232.4
+
+No changes.
+
+## 1.232.3
+
+No changes.
+
+## 1.232.2
+
+No changes.
+
 ## 1.232.1
 
 ### Bug fixes

diff --git a/packages/fxa-react/package.json b/packages/fxa-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fxa-react",
-  "version": "1.232.1",
+  "version": "1.232.5",
   "description": "Shared components for FxA React Apps",
   "exports": {
     "./components/": "./dist/components/",

diff --git a/packages/fxa-settings/CHANGELOG.md b/packages/fxa-settings/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 1.232.5
+
+No changes.
+
+## 1.232.4
+
+No changes.
+
+## 1.232.3
+
+No changes.
+
+## 1.232.2
+
+### Bug fixes
+
+- strings: Add default string for delete account checkbox ([7e45ffcf94](https://github.com/mozilla/fxa/commit/7e45ffcf94))
+
 ## 1.232.1
 
 ### Bug fixes

diff --git a/packages/fxa-settings/package.json b/packages/fxa-settings/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fxa-settings",
-  "version": "1.232.1",
+  "version": "1.232.5",
   "homepage": "https://accounts.firefox.com/settings",
   "private": true,
   "scripts": {

diff --git a/packages/fxa-shared/CHANGELOG.md b/packages/fxa-shared/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Change history
 
+## 1.232.5
+
+### New features
+
+- l10n: remove sr-LATN support. Fix FXA-5126 ([92f6d1cc7d](https://github.com/mozilla/fxa/commit/92f6d1cc7d))
+
+## 1.232.4
+
+No changes.
+
+## 1.232.3
+
+No changes.
+
+## 1.232.2
+
+No changes.
+
 ## 1.232.1
 
 ### Bug fixes

diff --git a/packages/fxa-shared/package.json b/packages/fxa-shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fxa-shared",
-  "version": "1.232.1",
+  "version": "1.232.5",
   "description": "Shared module for FxA repositories",
   "main": "dist/index.js",
   "exports": {