Commit 2db2ae8e authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre

Merge branch '19165-explore-projects-default-to-all' into 'master'

Make Explore Projects default to All

Closes #19165

See merge request gitlab-org/gitlab!23811
parents 2ae55374 077fd646
.top-area .top-area
%ul.nav-links.nav.nav-tabs %ul.nav-links.nav.nav-tabs
= nav_link(page: [trending_explore_projects_path, explore_root_path]) do = nav_link(page: [explore_projects_path, explore_root_path]) do
= link_to trending_explore_projects_path do = link_to explore_projects_path do
= _('Trending') = _('All')
= nav_link(page: starred_explore_projects_path) do = nav_link(page: starred_explore_projects_path) do
= link_to starred_explore_projects_path do = link_to starred_explore_projects_path do
= _('Most stars') = _('Most stars')
= nav_link(page: explore_projects_path) do = nav_link(page: trending_explore_projects_path) do
= link_to explore_projects_path do = link_to trending_explore_projects_path do
= _('All') = _('Trending')
.nav-controls .nav-controls
- unless current_user - unless current_user
......
---
title: Make Explore Projects default to All
merge_request: 23811
author:
type: changed
...@@ -8,7 +8,7 @@ namespace :explore do ...@@ -8,7 +8,7 @@ namespace :explore do
resources :groups, only: [:index] resources :groups, only: [:index]
resources :snippets, only: [:index] resources :snippets, only: [:index]
root to: 'projects#trending' root to: 'projects#index'
end end
# Compatibility with old routing # Compatibility with old routing
......
...@@ -51,7 +51,7 @@ describe 'Dashboard shortcuts', :js do ...@@ -51,7 +51,7 @@ describe 'Dashboard shortcuts', :js do
find('body').send_keys([:shift, 'P']) find('body').send_keys([:shift, 'P'])
find('.nothing-here-block') find('.nothing-here-block')
expect(page).to have_content('Explore public groups to find projects to contribute to.') expect(page).to have_content("This user doesn't have any personal projects")
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment