diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
| commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
| tree | c42be41678c2586d49a75cabce89322082698334 /app/assets/javascripts/create_cluster | |
| parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) | |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/assets/javascripts/create_cluster')
4 files changed, 7 insertions, 5 deletions
diff --git a/app/assets/javascripts/create_cluster/gke_cluster/components/gke_machine_type_dropdown.vue b/app/assets/javascripts/create_cluster/gke_cluster/components/gke_machine_type_dropdown.vue index 6b18455bfcc..23c477bfbfd 100644 --- a/app/assets/javascripts/create_cluster/gke_cluster/components/gke_machine_type_dropdown.vue +++ b/app/assets/javascripts/create_cluster/gke_cluster/components/gke_machine_type_dropdown.vue @@ -95,7 +95,7 @@ export default { </li> </ul> </div> - <div class="dropdown-loading"><gl-loading-icon /></div> + <div class="dropdown-loading"><gl-loading-icon size="sm" /></div> </div> </div> <span diff --git a/app/assets/javascripts/create_cluster/gke_cluster/components/gke_project_id_dropdown.vue b/app/assets/javascripts/create_cluster/gke_cluster/components/gke_project_id_dropdown.vue index b6f0bdbf01d..aba6dd4b493 100644 --- a/app/assets/javascripts/create_cluster/gke_cluster/components/gke_project_id_dropdown.vue +++ b/app/assets/javascripts/create_cluster/gke_cluster/components/gke_project_id_dropdown.vue @@ -160,7 +160,7 @@ export default { </li> </ul> </div> - <div class="dropdown-loading"><gl-loading-icon /></div> + <div class="dropdown-loading"><gl-loading-icon size="sm" /></div> </div> </div> <span diff --git a/app/assets/javascripts/create_cluster/gke_cluster/components/gke_zone_dropdown.vue b/app/assets/javascripts/create_cluster/gke_cluster/components/gke_zone_dropdown.vue index daab42c7e60..027ce74753e 100644 --- a/app/assets/javascripts/create_cluster/gke_cluster/components/gke_zone_dropdown.vue +++ b/app/assets/javascripts/create_cluster/gke_cluster/components/gke_zone_dropdown.vue @@ -84,7 +84,7 @@ export default { </li> </ul> </div> - <div class="dropdown-loading"><gl-loading-icon /></div> + <div class="dropdown-loading"><gl-loading-icon size="sm" /></div> </div> </div> <span diff --git a/app/assets/javascripts/create_cluster/gke_cluster/index.js b/app/assets/javascripts/create_cluster/gke_cluster/index.js index 4eafbdb7265..3a42b460e1c 100644 --- a/app/assets/javascripts/create_cluster/gke_cluster/index.js +++ b/app/assets/javascripts/create_cluster/gke_cluster/index.js @@ -1,5 +1,5 @@ import Vue from 'vue'; -import { deprecatedCreateFlash as Flash } from '~/flash'; +import createFlash from '~/flash'; import GkeMachineTypeDropdown from './components/gke_machine_type_dropdown.vue'; import GkeProjectIdDropdown from './components/gke_project_id_dropdown.vue'; import GkeSubmitButton from './components/gke_submit_button.vue'; @@ -59,7 +59,9 @@ const mountGkeSubmitButton = () => { }; const gkeDropdownErrorHandler = () => { - Flash(CONSTANTS.GCP_API_ERROR); + createFlash({ + message: CONSTANTS.GCP_API_ERROR, + }); }; const initializeGapiClient = (gapi) => () => { |