diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-18 03:08:53 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-18 03:08:53 +0300 |
| commit | 9214cac69b0f0306a86056720cfc62b738449c19 (patch) | |
| tree | 79c6fdbc2c8b379dd908294faa54c3fa2ab97551 /app/views/explore | |
| parent | 13d851c795a48b670b859a7ec5bd6e2886d2789e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/explore')
| -rw-r--r-- | app/views/explore/groups/_groups.html.haml | 2 | ||||
| -rw-r--r-- | app/views/explore/groups/index.html.haml | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/app/views/explore/groups/_groups.html.haml b/app/views/explore/groups/_groups.html.haml index 3291129fd69..37e5be521b4 100644 --- a/app/views/explore/groups/_groups.html.haml +++ b/app/views/explore/groups/_groups.html.haml @@ -1,3 +1,3 @@ .js-groups-list-holder - #js-groups-tree{ data: { endpoint: explore_groups_path(format: :json), path: explore_groups_path, form_sel: 'form#group-filter-form', filter_sel: '.js-groups-list-filter', holder_sel: '.js-groups-list-holder', dropdown_sel: '.js-group-filter-dropdown-wrap' } } + #js-groups-tree{ data: { endpoint: explore_groups_path(format: :json), path: explore_groups_path, form_sel: 'form#group-filter-form', filter_sel: '.js-groups-list-filter', holder_sel: '.js-groups-list-holder', dropdown_sel: '.js-group-filter-dropdown-wrap', groups_empty_state_illustration: image_path('illustrations/empty-state/empty-groups-md.svg') } } = gl_loading_icon(size: 'md', css_class: 'gl-mt-6') diff --git a/app/views/explore/groups/index.html.haml b/app/views/explore/groups/index.html.haml index 213346b4cc2..ddb82411add 100644 --- a/app/views/explore/groups/index.html.haml +++ b/app/views/explore/groups/index.html.haml @@ -22,7 +22,4 @@ %p= _("Below you will find all the groups that are public.") %p= _("You can easily contribute to them by requesting to join these groups.") -- if params[:filter].blank? && @groups.empty? - .nothing-here-block= _("No public groups") -- else - = render 'groups' += render 'groups' |