Commit a3f0a176 authored by Rémy Coutable's avatar Rémy Coutable

Don't show "Welcome to GitLab" when the search didn't return any projects

parent c71c5876
...@@ -16,6 +16,7 @@ v 8.5.2 ...@@ -16,6 +16,7 @@ v 8.5.2
- Fix broken icons on installations with relative URL (Artem Sidorenko) - Fix broken icons on installations with relative URL (Artem Sidorenko)
- Fix import from gitlab.com (KazSawada) - Fix import from gitlab.com (KazSawada)
- Fix help keyboard shortcut on relative URL setups (Artem Sidorenko) - Fix help keyboard shortcut on relative URL setups (Artem Sidorenko)
- Don't show "Welcome to GitLab" when the search didn't return any projects
v 8.5.1 v 8.5.1
- Fix group projects styles - Fix group projects styles
......
...@@ -6,7 +6,7 @@ def index ...@@ -6,7 +6,7 @@ def index
@projects = @projects.sort(@sort = params[:sort]) @projects = @projects.sort(@sort = params[:sort])
@projects = @projects.includes(:namespace) @projects = @projects.includes(:namespace)
terms = params['filter_projects'] terms = params[:filter_projects]
if terms.present? if terms.present?
@projects = @projects.search(terms) @projects = @projects.search(terms)
...@@ -35,7 +35,7 @@ def starred ...@@ -35,7 +35,7 @@ def starred
@projects = @projects.includes(:namespace, :forked_from_project, :tags) @projects = @projects.includes(:namespace, :forked_from_project, :tags)
@projects = @projects.sort(@sort = params[:sort]) @projects = @projects.sort(@sort = params[:sort])
terms = params['filter_projects'] terms = params[:filter_projects]
if terms.present? if terms.present?
@projects = @projects.search(terms) @projects = @projects.search(terms)
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
- if @last_push - if @last_push
= render "events/event_last_push", event: @last_push = render "events/event_last_push", event: @last_push
- if @projects.any? - if @projects.any? || params[:filter_projects]
= render 'projects' = render 'projects'
- else - else
= render "zero_authorized_projects" = render "zero_authorized_projects"
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