chore: 🤖 merge main + resolve conflicts

addons/api/mirage/factories/scope.js

@@ -7,8 +7,8 @@ export default factory.extend({
   authorized_collection_actions: () => {
     return {
       users: ['create', 'list'],
-      // groups: ['create', 'list'],
-      // roles: ['create', 'list'],
+      groups: ['create', 'list'],
+      roles: ['create', 'list'],
       // 'auth-methods': ['create', 'list'],
       // sessopms: ['list'],
       targets: ['create', 'list'],

addons/api/package.json

@@ -41,7 +41,7 @@
     "broccoli-asset-rev": "^3.0.0",
     "doctoc": "^2.0.0",
     "ember-auto-import": "^1.10.1",
-    "ember-cli": "~3.27.0",
+    "ember-cli": "~3.28.0",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-inject-live-reload": "^2.1.0",
     "ember-cli-sri": "^2.1.1",