Merge branch 'fix/13785-dashboard-projects-display-welcome-after-sear…

…ch' into 'master'


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

Fixes #13785. /cc @pixdrift

### Before

![Screen_Shot_2016-03-02_at_10.55.02](/uploads/b6b6ead2143d01e374ad296e72182d79/Screen_Shot_2016-03-02_at_10.55.02.png)

### After

![Screen_Shot_2016-03-02_at_12.12.33](/uploads/6e16c44e69039c534ea0fc3373c6060b/Screen_Shot_2016-03-02_at_12.12.33.png)

See merge request !3059

CHANGELOG

@@ -14,6 +14,7 @@ v 8.5.2
   - Fix help keyboard shortcut on relative URL setups (Artem Sidorenko)
   - Update Rails to 4.2.5.2
   - Fix permissions for deprecated CI build status badge
+  - Don't show "Welcome to GitLab" when the search didn't return any projects
 
 v 8.5.1
   - Fix group projects styles

app/controllers/dashboard/projects_controller.rb

@@ -6,7 +6,7 @@ def index
     @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 @@ def starred
     @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)

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"

app/views/shared/projects/_list.html.haml

@@ -23,7 +23,7 @@
             Show all
     = paginate projects, theme: "gitlab" if projects.respond_to? :total_pages
   - else
-    %h3 No projects found
+    .nothing-here-block No projects found
 
 :javascript
   new ProjectsList();