Commit d9117d23 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '58256-incorrect-empty-state-message-displayed-on-explore-projects-tab' into 'master'

Resolve Incorrect empty state message on "Explore projects"

Closes #58256

See merge request gitlab-org/gitlab-ce!25578
parents cb497dd4 2330ad3c
= render 'shared/projects/list', projects: projects, user: current_user
- is_explore_page = defined?(explore_page) && explore_page
= render 'shared/projects/list', projects: projects, user: current_user, explore_page: is_explore_page
......@@ -10,4 +10,4 @@
= render 'explore/head'
= render 'explore/projects/nav' unless Feature.enabled?(:project_list_filter_bar) && current_user
= render 'projects', projects: @projects
= render 'projects', projects: @projects, explore_page: true
......@@ -21,6 +21,7 @@
- own_projects_current_user_empty_message_header = s_('UserProfile|You haven\'t created any personal projects.')
- own_projects_current_user_empty_message_description = s_('UserProfile|Your projects can be available publicly, internally, or privately, at your choice.')
- own_projects_visitor_empty_message = s_('UserProfile|This user doesn\'t have any personal projects')
- explore_page_empty_message = s_('UserProfile|Explore public groups to find projects to contribute to.')
- primary_button_label = _('New project')
- primary_button_link = new_project_path
- secondary_button_label = _('Explore groups')
......@@ -58,4 +59,4 @@
current_user_empty_message_description: own_projects_current_user_empty_message_description,
primary_button_label: primary_button_label,
primary_button_link: primary_button_link,
visitor_empty_message: own_projects_visitor_empty_message }
visitor_empty_message: defined?(explore_page) && explore_page ? explore_page_empty_message : own_projects_visitor_empty_message }
---
title: Resolve Incorrect empty state message on Explore projects
merge_request: 25578
author:
type: fixed
......@@ -51,7 +51,7 @@ describe 'Dashboard shortcuts', :js do
find('body').send_keys([:shift, 'P'])
find('.nothing-here-block')
expect(page).to have_content('This user doesn\'t have any personal projects')
expect(page).to have_content('Explore public groups to find projects to contribute to.')
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