diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-09-05 14:05:14 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-09-05 14:05:14 +0000 |
| commit | f6097cbfaa1fae7cceef583bb3dbbd85286c80c2 (patch) | |
| tree | 14a3f611f1d5656b9d5ed0bb3018d043d7ec080b /app | |
| parent | 464b0de1acfc9383a551a05efa8c8a705c8bf70c (diff) | |
| parent | 70b7cf35880bec31a27c19e347585dd1513dedeb (diff) | |
| download | gitlab-ce-f6097cbfaa1fae7cceef583bb3dbbd85286c80c2.tar.gz | |
Merge branch '50974-qa-group-filtering-fails-when-filter-text-field-is-filled-before-the-group-list-is-fully-loaded-leading-to-path-has-already-been-taken-error-qa-tries-to-create-a-bew-subgroup-qa' into 'master'
Resolve "[QA] Group filtering fails when filter text field is filled before the group list is fully loaded leading to "Path has already been taken" error QA tries to create a bew subgroup"
Closes #50974
See merge request gitlab-org/gitlab-ce!21475
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/groups/components/groups.vue | 2 | ||||
| -rw-r--r-- | app/views/shared/groups/_empty_state.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/groups/components/groups.vue b/app/assets/javascripts/groups/components/groups.vue index adde8c8cdb3..73ae928b0d9 100644 --- a/app/assets/javascripts/groups/components/groups.vue +++ b/app/assets/javascripts/groups/components/groups.vue @@ -37,7 +37,7 @@ </script> <template> - <div class="groups-list-tree-container"> + <div class="groups-list-tree-container qa-groups-list-tree-container"> <div v-if="searchEmpty" class="has-no-search-results" diff --git a/app/views/shared/groups/_empty_state.html.haml b/app/views/shared/groups/_empty_state.html.haml index 13bb4baee3f..a9c78547eae 100644 --- a/app/views/shared/groups/_empty_state.html.haml +++ b/app/views/shared/groups/_empty_state.html.haml @@ -1,4 +1,4 @@ -.groups-empty-state +.groups-empty-state.qa-groups-empty-state = custom_icon("icon_empty_groups") .text-content |