Merge branch 'develop' into fix-set-password

addons/api/addon/models/group.js

@@ -46,8 +46,6 @@ export default class GroupModel extends GeneratedGroupModel {
       memberIDs,
     };
     // There is no "deep merge" in ES.
-    // All of this nonsense is here to ensure we get
-    // a decent merge of `adapterOptions`.
     return this.save({
       ...options,
       adapterOptions: {
@@ -71,8 +69,6 @@ export default class GroupModel extends GeneratedGroupModel {
       memberIDs,
     };
     // There is no "deep merge" in ES.
-    // All of this nonsense is here to ensure we get
-    // a decent merge of `adapterOptions`.
     return this.save({
       ...options,
       adapterOptions: {

addons/api/addon/models/role.js

@@ -53,8 +53,6 @@ export default class RoleModel extends GeneratedRoleModel {
       principalIDs,
     };
     // There is no "deep merge" in ES.
-    // All of this nonsense is here to ensure we get
-    // a decent merge of `adapterOptions`.
     return this.save({
       ...options,
       adapterOptions: {
@@ -78,8 +76,6 @@ export default class RoleModel extends GeneratedRoleModel {
       principalIDs,
     };
     // There is no "deep merge" in ES.
-    // All of this nonsense is here to ensure we get
-    // a decent merge of `adapterOptions`.
     return this.save({
       ...options,
       adapterOptions: {

addons/api/addon/models/target.js

@@ -52,8 +52,6 @@ export default class TargetModel extends GeneratedTargetModel {
       hostSetIDs,
     };
     // There is no "deep merge" in ES.
-    // All of this nonsense is here to ensure we get
-    // a decent merge of `adapterOptions`.
     return this.save({
       ...options,
       adapterOptions: {
@@ -77,8 +75,6 @@ export default class TargetModel extends GeneratedTargetModel {
       hostSetIDs,
     };
     // There is no "deep merge" in ES.
-    // All of this nonsense is here to ensure we get
-    // a decent merge of `adapterOptions`.
     return this.save({
       ...options,
       adapterOptions: {

addons/api/addon/models/user.js

@@ -33,8 +33,6 @@ export default class UserModel extends GeneratedUserModel {
       accountIDs,
     };
     // There is no "deep merge" in ES.
-    // All of this nonsense is here to ensure we get
-    // a decent merge of `adapterOptions`.
     return this.save({
       ...options,
       adapterOptions: {
@@ -58,8 +56,6 @@ export default class UserModel extends GeneratedUserModel {
       accountIDs,
     };
     // There is no "deep merge" in ES.
-    // All of this nonsense is here to ensure we get
-    // a decent merge of `adapterOptions`.
     return this.save({
       ...options,
       adapterOptions: {