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

This commit is contained in:
Rémy Coutable 2016-03-02 10:55:47 +01:00
parent c71c5876cb
commit a3f0a176ff
3 changed files with 4 additions and 3 deletions

View File

@ -16,6 +16,7 @@ v 8.5.2
- Fix broken icons on installations with relative URL (Artem Sidorenko)
- Fix import from gitlab.com (KazSawada)
- 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
- Fix group projects styles

View File

@ -6,7 +6,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
@projects = @projects.sort(@sort = params[:sort])
@projects = @projects.includes(:namespace)
terms = params['filter_projects']
terms = params[:filter_projects]
if terms.present?
@projects = @projects.search(terms)
@ -35,7 +35,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
@projects = @projects.includes(:namespace, :forked_from_project, :tags)
@projects = @projects.sort(@sort = params[:sort])
terms = params['filter_projects']
terms = params[:filter_projects]
if terms.present?
@projects = @projects.search(terms)

View File

@ -10,7 +10,7 @@
- if @last_push
= render "events/event_last_push", event: @last_push
- if @projects.any?
- if @projects.any? || params[:filter_projects]
= render 'projects'
- else
= render "zero_authorized_projects"