diff options
| author | Phil Hughes <me@iamphill.com> | 2017-05-04 15:57:08 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-05-04 15:57:08 +0100 |
| commit | 9904c12746e744c4e271fe454b04a54dfb9b668e (patch) | |
| tree | ea12986e382846a6918b1c20703174ad5101179b | |
| parent | 79f40f27fd64b9209e1faa528e658d831e2c7f2f (diff) | |
| download | gitlab-ce-9904c12746e744c4e271fe454b04a54dfb9b668e.tar.gz | |
Updated webpack config
| -rw-r--r-- | app/assets/javascripts/deploy_keys/components/app.vue | 6 | ||||
| -rw-r--r-- | config/webpack.config.js | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/app/assets/javascripts/deploy_keys/components/app.vue b/app/assets/javascripts/deploy_keys/components/app.vue index 2ba5001cf56..a6552125e66 100644 --- a/app/assets/javascripts/deploy_keys/components/app.vue +++ b/app/assets/javascripts/deploy_keys/components/app.vue @@ -32,7 +32,6 @@ methods: { fetchKeys() { this.isLoading = true; - this.store.keys = {}; this.service.getKeys() .then((data) => { @@ -46,9 +45,6 @@ .then(() => this.fetchKeys()) .catch(() => new Flash('Error enabling deploy key')); }, - removeKey(deployKey) { - this.disableKey(deployKey); - }, disableKey(deployKey) { // eslint-disable-next-line no-alert if (confirm('You are going to remove this deploy key. Are you sure?')) { @@ -62,7 +58,7 @@ this.service = new DeployKeysService(this.endpoint); eventHub.$on('enable.key', this.enableKey); - eventHub.$on('remove.key', this.removeKey); + eventHub.$on('remove.key', this.disableKey); eventHub.$on('disable.key', this.disableKey); }, mounted() { diff --git a/config/webpack.config.js b/config/webpack.config.js index 742d22d0c1f..239bb5ec436 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -123,6 +123,7 @@ var config = { 'boards', 'commit_pipelines', 'cycle_analytics', + 'deploy_keys', 'diff_notes', 'environments', 'environments_folder', |