diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-03-02 10:55:47 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-02 11:41:35 +0100 |
| commit | a3f0a176ff7afcc048d482d691990748a4018251 (patch) | |
| tree | 90219de9b2e4078a82ff905632e81addd313ee36 | |
| parent | c71c5876cbb66890c87de063982d671299c9dc8e (diff) | |
| download | gitlab-ce-a3f0a176ff7afcc048d482d691990748a4018251.tar.gz | |
Don't show "Welcome to GitLab" when the search didn't return any projects
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/controllers/dashboard/projects_controller.rb | 4 | ||||
| -rw-r--r-- | app/views/dashboard/projects/index.html.haml | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index ae9b25fd7bb..97e265bf175 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb index 2df6924b13d..aeafbd30143 100644 --- a/app/controllers/dashboard/projects_controller.rb +++ b/app/controllers/dashboard/projects_controller.rb @@ -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) diff --git a/app/views/dashboard/projects/index.html.haml b/app/views/dashboard/projects/index.html.haml index 53abf274bdb..4565e752c1f 100644 --- a/app/views/dashboard/projects/index.html.haml +++ b/app/views/dashboard/projects/index.html.haml @@ -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" |