diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 09:07:32 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 09:07:32 +0300 |
commit | ca5ebd2044ce696cc1aafc8a80a606e20f2c9e4b (patch) | |
tree | 55977b453321e7a929db00509e51f4d8b86c1d66 /app/views/explore | |
parent | da87ccca5c1e2cdb077702fcb63884d652179c2f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/explore')
-rw-r--r-- | app/views/explore/projects/_filter.html.haml | 4 | ||||
-rw-r--r-- | app/views/explore/projects/_nav.html.haml | 1 | ||||
-rw-r--r-- | app/views/explore/projects/index.html.haml | 2 | ||||
-rw-r--r-- | app/views/explore/projects/page_out_of_bounds.html.haml | 2 | ||||
-rw-r--r-- | app/views/explore/projects/starred.html.haml | 2 | ||||
-rw-r--r-- | app/views/explore/projects/topic.html.haml | 1 | ||||
-rw-r--r-- | app/views/explore/projects/trending.html.haml | 2 |
7 files changed, 5 insertions, 9 deletions
diff --git a/app/views/explore/projects/_filter.html.haml b/app/views/explore/projects/_filter.html.haml index f02d30081b6..67a88f3d623 100644 --- a/app/views/explore/projects/_filter.html.haml +++ b/app/views/explore/projects/_filter.html.haml @@ -1,9 +1,7 @@ - has_label = local_assigns.fetch(:has_label, false) -- feature_project_list_filter_bar = Feature.enabled?(:project_list_filter_bar) -- klass = feature_project_list_filter_bar ? 'gl-ml-3 gl-display-flex gl-flex-grow-1 gl-flex-shrink-1' : 'gl-ml-3' - selected = projects_filter_selected(params[:visibility_level]) - if current_user - unless has_label %span.gl-float-left= _("Visibility:") - = gl_redirect_listbox_tag(projects_filter_items, selected, class: klass, data: { right: true }) + = gl_redirect_listbox_tag(projects_filter_items, selected, class: 'gl-ml-3', data: { right: true }) diff --git a/app/views/explore/projects/_nav.html.haml b/app/views/explore/projects/_nav.html.haml index 9d7a6f1ccfb..9119026320a 100644 --- a/app/views/explore/projects/_nav.html.haml +++ b/app/views/explore/projects/_nav.html.haml @@ -7,5 +7,4 @@ .nav-controls - unless current_user = render 'shared/projects/search_form' - = render 'shared/projects/dropdown' = render 'filter' diff --git a/app/views/explore/projects/index.html.haml b/app/views/explore/projects/index.html.haml index ae59d9c728b..9585eb76912 100644 --- a/app/views/explore/projects/index.html.haml +++ b/app/views/explore/projects/index.html.haml @@ -10,5 +10,5 @@ - else = render 'explore/head' -= render 'explore/projects/nav' unless Feature.enabled?(:project_list_filter_bar) && current_user += render 'explore/projects/nav' = render 'projects', projects: @projects diff --git a/app/views/explore/projects/page_out_of_bounds.html.haml b/app/views/explore/projects/page_out_of_bounds.html.haml index e8a66e66c72..ef5ee2c679e 100644 --- a/app/views/explore/projects/page_out_of_bounds.html.haml +++ b/app/views/explore/projects/page_out_of_bounds.html.haml @@ -9,7 +9,7 @@ - else = render 'explore/head' -= render 'explore/projects/nav' unless Feature.enabled?(:project_list_filter_bar) && current_user += render 'explore/projects/nav' .nothing-here-block .svg-content diff --git a/app/views/explore/projects/starred.html.haml b/app/views/explore/projects/starred.html.haml index a1f2fea5134..ec7eefea264 100644 --- a/app/views/explore/projects/starred.html.haml +++ b/app/views/explore/projects/starred.html.haml @@ -9,5 +9,5 @@ - else = render 'explore/head' -= render 'explore/projects/nav' unless Feature.enabled?(:project_list_filter_bar) && current_user += render 'explore/projects/nav' = render 'projects', projects: @projects diff --git a/app/views/explore/projects/topic.html.haml b/app/views/explore/projects/topic.html.haml index 76e59a49ed1..7b2c5683482 100644 --- a/app/views/explore/projects/topic.html.haml +++ b/app/views/explore/projects/topic.html.haml @@ -25,7 +25,6 @@ .top-area.gl-pt-2.gl-pb-2 .nav-controls = render 'shared/projects/search_form' - = render 'shared/projects/dropdown' = render 'filter' = render 'projects', projects: @projects diff --git a/app/views/explore/projects/trending.html.haml b/app/views/explore/projects/trending.html.haml index e23f63b0064..8a92ec31b22 100644 --- a/app/views/explore/projects/trending.html.haml +++ b/app/views/explore/projects/trending.html.haml @@ -9,5 +9,5 @@ - else = render 'explore/head' -= render 'explore/projects/nav' unless Feature.enabled?(:project_list_filter_bar) && current_user += render 'explore/projects/nav' = render 'projects', projects: @projects |