From 0ed506a111e5abfc5cf1d95d23eb9af701b88874 Mon Sep 17 00:00:00 2001 From: dharini Date: Thu, 2 Sep 2021 10:22:47 -0700 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20merge=20main=20+=20reso?= =?UTF-8?q?lve=20conflicts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/api/mirage/factories/scope.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/addons/api/mirage/factories/scope.js b/addons/api/mirage/factories/scope.js index 523693a4e..f4c7073f7 100644 --- a/addons/api/mirage/factories/scope.js +++ b/addons/api/mirage/factories/scope.js @@ -3,11 +3,6 @@ import { trait } from 'ember-cli-mirage'; export default factory.extend({ type: 'global', - authorized_collection_actions: () => { - return { - 'host-catalogs': ['create', 'list'], - }; - }, authorized_collection_actions: () => { return { @@ -17,7 +12,7 @@ export default factory.extend({ // 'auth-methods': ['create', 'list'], // sessopms: ['list'], // targets: ['create', 'list'], - // 'host-catalogs': ['create', 'list'], + 'host-catalogs': ['create', 'list'], // 'credential-stores': ['create', 'list'], }; },