diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-07 17:37:50 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-07 17:37:50 +0300 |
| commit | ee0e3ffc057d9a033dab3fcc9025e71a6e76bc74 (patch) | |
| tree | f326227fa14deacbdd323378d58bd2f6ef86f6d0 /app/assets/javascripts/deploy_keys/components/app.vue | |
| parent | d030393adb414a9264623f403d2b6f39adcf3b4e (diff) | |
| parent | 3d70eeb5bb9dac8073a149547dc3b85c90d65e7d (diff) | |
Merge branch '3191-deploy-keys-update' into 'master'
Implement ability to update deploy keys
Closes #3191
See merge request !10383
Diffstat (limited to 'app/assets/javascripts/deploy_keys/components/app.vue')
| -rw-r--r-- | app/assets/javascripts/deploy_keys/components/app.vue | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/app/assets/javascripts/deploy_keys/components/app.vue b/app/assets/javascripts/deploy_keys/components/app.vue index 285124e9515..a663e30dfd0 100644 --- a/app/assets/javascripts/deploy_keys/components/app.vue +++ b/app/assets/javascripts/deploy_keys/components/app.vue @@ -80,21 +80,27 @@ v-if="isLoading && !hasKeys" size="2" label="Loading deploy keys" - /> + /> <div v-else-if="hasKeys"> <keys-panel title="Enabled deploy keys for this project" :keys="keys.enabled_keys" - :store="store" /> + :store="store" + :endpoint="endpoint" + /> <keys-panel title="Deploy keys from projects you have access to" :keys="keys.available_project_keys" - :store="store" /> + :store="store" + :endpoint="endpoint" + /> <keys-panel v-if="keys.public_keys.length" title="Public deploy keys available to any project" :keys="keys.public_keys" - :store="store" /> + :store="store" + :endpoint="endpoint" + /> </div> </div> </template> |