diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-06-05 10:39:59 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-06-05 10:39:59 +0300 |
| commit | 809a50fcbf5ecfbf5ec02671f1ca2710a96f58d3 (patch) | |
| tree | 0b77ad7a705f6477b03d0f83634a73e3cf36f7d1 /app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue | |
| parent | 114c26ccf0f10788271c6108774e72809a7f93e1 (diff) | |
| parent | 04236363bce399fbde36f396fdcf51d61735e1b0 (diff) | |
Merge branch 'master' into 'backstage/gb/use-persisted-stages-to-improve-pipelines-table'
Conflicts:
app/models/ci/pipeline.rb
Diffstat (limited to 'app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue')
| -rw-r--r-- | app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue index 6be39702546..ab7d2d41ece 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue @@ -132,7 +132,7 @@ export default { </div> </div> <span - class="help-block" + class="form-text text-muted" :class="{ 'gl-field-error': hasErrors }" v-if="hasErrors" > |