resolve merge conflicts from rebase

hashicorp · Feb 13, 2020 · dac7e7d · dac7e7d
1 parent 46a9b78
commit dac7e7d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/ui/app/models/transit-key.js b/ui/app/models/transit-key.js
@@ -3,7 +3,6 @@ import { set, get, computed } from '@ember/object';
 import DS from 'ember-data';
 import clamp from 'vault/utils/clamp';
 import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
-import attachCapabilities from 'vault/lib/attach-capabilities';
 
 const { attr } = DS;
 
@@ -42,7 +41,7 @@ const ACTION_VALUES = {
   export: { isSupported: 'exportable', description: 'Get the named key', glyph: 'exit' },
 };
 
-let Model = DS.Model.extend({
+export default DS.Model.extend({
   type: attr('string', {
     defaultValue: 'aes256-gcm96',
   }),

diff --git a/ui/app/templates/partials/secret-list/item.hbs b/ui/app/templates/partials/secret-list/item.hbs
@@ -10,7 +10,7 @@
   class="list-item-row"
   data-test-secret-link=item.id
   encode=true
-  queryParams=(hash (secret-query-params backendModel.type))
+  queryParams=(secret-query-params backendModel.type)
 }}
   <div class="columns is-mobile">
     <div class="column is-10">