diff options
| author | Dennis Tang <dtang@gitlab.com> | 2018-05-23 16:13:30 +0200 |
|---|---|---|
| committer | Dennis Tang <dtang@gitlab.com> | 2018-05-23 16:13:30 +0200 |
| commit | 7cc690ee6bd604e131856f5c4bf5d08631af40e9 (patch) | |
| tree | 13ba5a2af4bb6ca53e95edd6baf2d9caacc7e2f7 | |
| parent | 4e0e0552c674c44d7e6ddd2acb08cd6c1857093c (diff) | |
| parent | 247b20972b51fce323939bfa43340ad32f7e9a30 (diff) | |
| download | gitlab-ce-7cc690ee6bd604e131856f5c4bf5d08631af40e9.tar.gz | |
Merge branch '38759-fetch-available-parameters-directly-from-gke-when-creating-a-cluster' of gitlab.com:gitlab-org/gitlab-ce into 38759-fetch-available-parameters-directly-from-gke-when-creating-a-cluster
# Conflicts:
# app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue
# app/assets/javascripts/projects/gke_cluster_dropdowns/index.js
| -rw-r--r-- | app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue index 28440da635b..bdd4d8676f0 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue @@ -115,6 +115,11 @@ export default { this.isValidatingProjectBilling = false; }, }, + data() { + return { + isValidatingProjectBilling: false, + }; + }, created() { this.isLoading = true; |