From 87b61db7ed6b782423397626b6ea414c43f24a15 Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Wed, 3 Feb 2016 13:47:38 -0500
Subject: [PATCH 1/8] Page project list on dashboard

---
 app/controllers/dashboard/projects_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb
index 721e2a6bcb..a205ab7d34 100644
--- a/app/controllers/dashboard/projects_controller.rb
+++ b/app/controllers/dashboard/projects_controller.rb
@@ -5,6 +5,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
     @projects = current_user.authorized_projects.sorted_by_activity.non_archived
     @projects = @projects.sort(@sort = params[:sort])
     @projects = @projects.includes(:namespace)
+    @projects = @projects.page(params[:page]).per(PER_PAGE)
     @last_push = current_user.recent_push
 
     respond_to do |format|
@@ -21,6 +22,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
     @projects = current_user.starred_projects
     @projects = @projects.includes(:namespace, :forked_from_project, :tags)
     @projects = @projects.sort(@sort = params[:sort])
+    @projects = @projects.page(params[:page]).per(PER_PAGE)
     @last_push = current_user.recent_push
     @groups = []
 

From 7522ac0b3cf4a777fda5dce3baa699970e5133a6 Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Wed, 3 Feb 2016 16:33:01 -0500
Subject: [PATCH 2/8] Paginate + ajax filter dashboard projects

---
 .../javascripts/projects_list.js.coffee       | 26 ++++++++--------
 app/controllers/application_controller.rb     |  5 ++--
 .../dashboard/projects_controller.rb          | 12 ++++++++
 .../explore/projects_controller.rb            | 12 ++++----
 app/views/dashboard/_projects_head.html.haml  | 13 ++++----
 .../dashboard/projects/_projects.html.haml    |  5 +++-
 .../explore/projects/_projects.html.haml      |  4 +--
 app/views/explore/projects/starred.html.haml  |  4 +--
 app/views/explore/projects/trending.html.haml |  2 +-
 app/views/shared/projects/_list.html.haml     | 30 ++++++++++---------
 10 files changed, 67 insertions(+), 46 deletions(-)

diff --git a/app/assets/javascripts/projects_list.js.coffee b/app/assets/javascripts/projects_list.js.coffee
index b71509dbc5..b477649362 100644
--- a/app/assets/javascripts/projects_list.js.coffee
+++ b/app/assets/javascripts/projects_list.js.coffee
@@ -11,16 +11,18 @@ class @ProjectsList
       uiBox = $('div.projects-list-holder')
       filterSelector = $(this).data('filter-selector') || 'span.filter-title'
 
-      if terms == "" || terms == undefined
-        uiBox.find("ul.projects-list li").show()
-      else
-        uiBox.find("ul.projects-list li").each (index) ->
-          name = $(this).find(filterSelector).text()
-
-          if name.toLowerCase().search(terms.toLowerCase()) == -1
-            $(this).hide()
-          else
-            $(this).show()
+      $('.projects-list-holder').css("opacity", '0.5')
+      form = $("#project-list-form")
+      project_filter_url = form.attr('action') + '?' + form.serialize()
+      $.ajax
+        type: "GET"
+        url: form.attr('action')
+        data: form.serialize()
+        complete: ->
+          $('.projects-list-holder').css("opacity", '1.0')
+        success: (data) ->
+          $('.projects-list-holder').html(data.html)
+          # Change url so if user reload a page - search results are saved
+          history.replaceState {page: project_filter_url}, document.title, project_filter_url
+        dataType: "json"
       uiBox.find("ul.projects-list li.bottom").hide()
-
-
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 7fa2f68ef0..c189f49895 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -277,9 +277,10 @@ class ApplicationController < ActionController::Base
     }
   end
 
-  def view_to_html_string(partial)
+  def view_to_html_string(partial, locals = nil)
     render_to_string(
-      partial,
+      partial: partial,
+      locals: locals,
       layout: false,
       formats: [:html]
     )
diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb
index a205ab7d34..2f56228ff7 100644
--- a/app/controllers/dashboard/projects_controller.rb
+++ b/app/controllers/dashboard/projects_controller.rb
@@ -5,6 +5,13 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
     @projects = current_user.authorized_projects.sorted_by_activity.non_archived
     @projects = @projects.sort(@sort = params[:sort])
     @projects = @projects.includes(:namespace)
+
+    terms = params['filter_projects']
+
+    if terms.present?
+      @projects = @projects.search(terms)
+    end
+
     @projects = @projects.page(params[:page]).per(PER_PAGE)
     @last_push = current_user.recent_push
 
@@ -15,6 +22,11 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
         load_events
         render layout: false
       end
+      format.json do
+        render json: {
+          html: view_to_html_string("dashboard/projects/projects", locals: { projects: @projects })
+        }
+      end
     end
   end
 
diff --git a/app/controllers/explore/projects_controller.rb b/app/controllers/explore/projects_controller.rb
index a5aeaed66c..2689bf4f1e 100644
--- a/app/controllers/explore/projects_controller.rb
+++ b/app/controllers/explore/projects_controller.rb
@@ -11,14 +11,14 @@ class Explore::ProjectsController < Explore::ApplicationController
   end
 
   def trending
-    @trending_projects = TrendingProjectsFinder.new.execute(current_user)
-    @trending_projects = @trending_projects.non_archived
-    @trending_projects = @trending_projects.page(params[:page]).per(PER_PAGE)
+    @projects = TrendingProjectsFinder.new.execute(current_user)
+    @projects = @projects.non_archived
+    @projects = @projects.page(params[:page]).per(PER_PAGE)
   end
 
   def starred
-    @starred_projects = ProjectsFinder.new.execute(current_user)
-    @starred_projects = @starred_projects.reorder('star_count DESC')
-    @starred_projects = @starred_projects.page(params[:page]).per(PER_PAGE)
+    @projects = ProjectsFinder.new.execute(current_user)
+    @projects = @projects.reorder('star_count DESC')
+    @projects = @projects.page(params[:page]).per(PER_PAGE)
   end
 end
diff --git a/app/views/dashboard/_projects_head.html.haml b/app/views/dashboard/_projects_head.html.haml
index d865a2c6fa..17eed52957 100644
--- a/app/views/dashboard/_projects_head.html.haml
+++ b/app/views/dashboard/_projects_head.html.haml
@@ -13,9 +13,10 @@
         Explore Projects
 
   .nav-controls
-    = search_field_tag :filter_projects, nil, placeholder: 'Filter by name...', class: 'projects-list-filter form-control hidden-xs input-short', spellcheck: false
-    = render 'explore/projects/dropdown'
-    - if current_user.can_create_project?
-      = link_to new_project_path, class: 'btn btn-new' do
-        = icon('plus')
-        New Project
+    = form_tag '', method: :get, class: 'project-list-form', id: 'project-list-form' do |f|
+      .append-right-10.hidden-xs.hidden-sm
+        = search_field_tag :filter_projects, params[:filter_projects], placeholder: 'Filter by name...', class: 'projects-list-filter form-control issue_search search-text-input', spellcheck: false, id: 'projects-list-filter'
+        - if current_user.can_create_project?
+          = link_to new_project_path, class: 'btn btn-new' do
+            = icon('plus')
+            New Project
diff --git a/app/views/dashboard/projects/_projects.html.haml b/app/views/dashboard/projects/_projects.html.haml
index cea9ffcc74..35ef73071c 100644
--- a/app/views/dashboard/projects/_projects.html.haml
+++ b/app/views/dashboard/projects/_projects.html.haml
@@ -1,3 +1,6 @@
 .projects-list-holder
 
-  = render 'shared/projects/list', projects: @projects, ci: true
+  = render 'shared/projects/list', ci: true
+
+  :javascript
+    new ProjectsList();
diff --git a/app/views/explore/projects/_projects.html.haml b/app/views/explore/projects/_projects.html.haml
index 669079e952..b64a491876 100644
--- a/app/views/explore/projects/_projects.html.haml
+++ b/app/views/explore/projects/_projects.html.haml
@@ -1,6 +1,6 @@
-- if projects.any?
+- if @projects.any?
   .public-projects
-    = render 'shared/projects/list', projects: projects
+    = render 'shared/projects/list'
 - else
   .nothing-here-block
     No such projects
diff --git a/app/views/explore/projects/starred.html.haml b/app/views/explore/projects/starred.html.haml
index 16f52f7a53..0bdd0a57fe 100644
--- a/app/views/explore/projects/starred.html.haml
+++ b/app/views/explore/projects/starred.html.haml
@@ -7,5 +7,5 @@
   = render 'explore/head'
 
 = render 'explore/projects/nav'
-= render 'projects', projects: @starred_projects
-= paginate @starred_projects, theme: 'gitlab'
+= render 'projects', projects: @projects
+= paginate @projects, theme: 'gitlab'
diff --git a/app/views/explore/projects/trending.html.haml b/app/views/explore/projects/trending.html.haml
index adcda81006..ec46175510 100644
--- a/app/views/explore/projects/trending.html.haml
+++ b/app/views/explore/projects/trending.html.haml
@@ -7,4 +7,4 @@
   = render 'explore/head'
 
 = render 'explore/projects/nav'
-= render 'projects', projects: @trending_projects
+= render 'projects', projects: @projects
diff --git a/app/views/shared/projects/_list.html.haml b/app/views/shared/projects/_list.html.haml
index b3f45373f6..80795063f6 100644
--- a/app/views/shared/projects/_list.html.haml
+++ b/app/views/shared/projects/_list.html.haml
@@ -8,18 +8,20 @@
 - show_last_commit_as_description = false unless local_assigns[:show_last_commit_as_description] == true
 
 %ul.projects-list
-  - projects.each_with_index do |project, i|
-    - css_class = (i >= projects_limit) ? 'hide' : nil
-    = render "shared/projects/project", project: project, skip_namespace: skip_namespace,
-      avatar: avatar, stars: stars, css_class: css_class, ci: ci, use_creator_avatar: use_creator_avatar,
-      forks: forks, show_last_commit_as_description: show_last_commit_as_description
+  - if @projects.any?
+    - @projects.each_with_index do |project, i|
+      - css_class = (i >= projects_limit) ? 'hide' : nil
+      = render "shared/projects/project", project: project, skip_namespace: skip_namespace,
+        avatar: avatar, stars: stars, css_class: css_class, ci: ci, use_creator_avatar: use_creator_avatar,
+        forks: forks, show_last_commit_as_description: show_last_commit_as_description
 
-  - if projects.size > projects_limit
-    %li.bottom.center
-      .light
-        #{projects_limit} of #{pluralize(projects.count, 'project')} displayed.
-        = link_to '#', class: 'js-expand' do
-          Show all
-
-:javascript
-  new ProjectsList();
+    - if @projects.size > projects_limit
+      %li.bottom.center
+        .light
+          #{projects_limit} of #{pluralize(@projects.count, 'project')} displayed.
+          = link_to '#', class: 'js-expand' do
+            Show all
+    = paginate @projects, theme: "gitlab"
+  - else
+    %h3 No projects found
+    %p.slead Try searching for a different project.

From 2c871ca1968846871ed264cad34b50611eecae3b Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Wed, 3 Feb 2016 17:24:14 -0500
Subject: [PATCH 3/8] Delay filter until user stops typing

---
 app/assets/javascripts/dashboard.js.coffee    |  2 +-
 app/assets/javascripts/issues.js.coffee       |  2 +-
 .../javascripts/projects_list.js.coffee       | 49 +++++++++++--------
 app/assets/javascripts/user.js.coffee         |  2 +-
 app/views/dashboard/_projects_head.html.haml  |  2 +-
 .../dashboard/projects/_projects.html.haml    |  2 +-
 6 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/app/assets/javascripts/dashboard.js.coffee b/app/assets/javascripts/dashboard.js.coffee
index 00ee503ff1..dc0b9597d1 100644
--- a/app/assets/javascripts/dashboard.js.coffee
+++ b/app/assets/javascripts/dashboard.js.coffee
@@ -1,3 +1,3 @@
 class @Dashboard
   constructor: ->
-    new ProjectsList()
+    ProjectsList.init()
diff --git a/app/assets/javascripts/issues.js.coffee b/app/assets/javascripts/issues.js.coffee
index a0acf3028b..54e0074142 100644
--- a/app/assets/javascripts/issues.js.coffee
+++ b/app/assets/javascripts/issues.js.coffee
@@ -45,7 +45,7 @@
 
   filterResults: =>
     form = $("#issue_search_form")
-    search = $("#issue_search").val()
+    search = $("#projects-list-filter").val()
     $('.issues-holder').css("opacity", '0.5')
     issues_url = form.attr('action') + '?' + form.serialize()
 
diff --git a/app/assets/javascripts/projects_list.js.coffee b/app/assets/javascripts/projects_list.js.coffee
index b477649362..384b95118c 100644
--- a/app/assets/javascripts/projects_list.js.coffee
+++ b/app/assets/javascripts/projects_list.js.coffee
@@ -1,28 +1,35 @@
-class @ProjectsList
-  constructor: ->
+@ProjectsList =
+  init: ->
     $(".projects-list .js-expand").on 'click', (e) ->
       e.preventDefault()
       list = $(this).closest('.projects-list')
       list.find("li").show()
       list.find("li.bottom").hide()
+    this.initSearch()
 
-    $(".projects-list-filter").keyup ->
-      terms = $(this).val()
-      uiBox = $('div.projects-list-holder')
-      filterSelector = $(this).data('filter-selector') || 'span.filter-title'
+  initSearch: ->
+    @timer = null
+    $("#projects-list-filter").keyup ->
+      clearTimeout(@timer)
+      @timer = setTimeout(ProjectsList.filterResults, 500)
 
-      $('.projects-list-holder').css("opacity", '0.5')
-      form = $("#project-list-form")
-      project_filter_url = form.attr('action') + '?' + form.serialize()
-      $.ajax
-        type: "GET"
-        url: form.attr('action')
-        data: form.serialize()
-        complete: ->
-          $('.projects-list-holder').css("opacity", '1.0')
-        success: (data) ->
-          $('.projects-list-holder').html(data.html)
-          # Change url so if user reload a page - search results are saved
-          history.replaceState {page: project_filter_url}, document.title, project_filter_url
-        dataType: "json"
-      uiBox.find("ul.projects-list li.bottom").hide()
+  filterResults: =>
+    form = $("#project-list-form")
+    search = $("#issue_search").val()
+    uiBox = $('div.projects-list-holder')
+
+    $('.projects-list-holder').css("opacity", '0.5')
+
+    project_filter_url = form.attr('action') + '?' + form.serialize()
+    $.ajax
+      type: "GET"
+      url: form.attr('action')
+      data: form.serialize()
+      complete: ->
+        $('.projects-list-holder').css("opacity", '1.0')
+      success: (data) ->
+        $('.projects-list-holder').html(data.html)
+        # Change url so if user reload a page - search results are saved
+        history.replaceState {page: project_filter_url}, document.title, project_filter_url
+      dataType: "json"
+    uiBox.find("ul.projects-list li.bottom").hide()
diff --git a/app/assets/javascripts/user.js.coffee b/app/assets/javascripts/user.js.coffee
index ec4271b092..eb7f7bb26b 100644
--- a/app/assets/javascripts/user.js.coffee
+++ b/app/assets/javascripts/user.js.coffee
@@ -1,7 +1,7 @@
 class @User
   constructor: ->
     $('.profile-groups-avatars').tooltip("placement": "top")
-    new ProjectsList()
+    ProjectsList.init()
 
     $('.hide-project-limit-message').on 'click', (e) ->
       path = '/'
diff --git a/app/views/dashboard/_projects_head.html.haml b/app/views/dashboard/_projects_head.html.haml
index 17eed52957..ab2da1824c 100644
--- a/app/views/dashboard/_projects_head.html.haml
+++ b/app/views/dashboard/_projects_head.html.haml
@@ -15,7 +15,7 @@
   .nav-controls
     = form_tag '', method: :get, class: 'project-list-form', id: 'project-list-form' do |f|
       .append-right-10.hidden-xs.hidden-sm
-        = search_field_tag :filter_projects, params[:filter_projects], placeholder: 'Filter by name...', class: 'projects-list-filter form-control issue_search search-text-input', spellcheck: false, id: 'projects-list-filter'
+        = search_field_tag :filter_projects, params[:filter_projects], placeholder: 'Filter by name...', class: 'projects-list-filter form-control search-text-input', spellcheck: false, id: 'projects-list-filter'
         - if current_user.can_create_project?
           = link_to new_project_path, class: 'btn btn-new' do
             = icon('plus')
diff --git a/app/views/dashboard/projects/_projects.html.haml b/app/views/dashboard/projects/_projects.html.haml
index 35ef73071c..c08247cd9a 100644
--- a/app/views/dashboard/projects/_projects.html.haml
+++ b/app/views/dashboard/projects/_projects.html.haml
@@ -3,4 +3,4 @@
   = render 'shared/projects/list', ci: true
 
   :javascript
-    new ProjectsList();
+    ProjectsList.init()

From 2ad094132de3c491511261bf0e6a2e577fd699dd Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Wed, 3 Feb 2016 18:21:14 -0500
Subject: [PATCH 4/8] Various filter fixes

---
 app/assets/javascripts/dashboard.js.coffee    | 33 ++++++++++++--
 app/assets/javascripts/dispatcher.js.coffee   |  2 +-
 app/assets/javascripts/issues.js.coffee       |  2 +-
 .../javascripts/projects_list.js.coffee       | 43 +++++++------------
 app/assets/javascripts/user.js.coffee         |  2 +-
 app/controllers/application_controller.rb     |  4 +-
 .../dashboard/projects_controller.rb          | 14 ++++--
 .../explore/projects_controller.rb            | 12 +++---
 app/controllers/groups_controller.rb          |  1 +
 app/controllers/users_controller.rb           |  3 +-
 app/models/event.rb                           |  2 +-
 app/views/dashboard/_projects_head.html.haml  |  4 +-
 .../dashboard/projects/_projects.html.haml    |  4 +-
 .../explore/projects/_projects.html.haml      |  4 +-
 app/views/explore/projects/starred.html.haml  |  4 +-
 app/views/explore/projects/trending.html.haml |  2 +-
 app/views/projects/show.atom.builder          |  2 +-
 app/views/shared/projects/_list.html.haml     | 14 +++---
 18 files changed, 90 insertions(+), 62 deletions(-)

diff --git a/app/assets/javascripts/dashboard.js.coffee b/app/assets/javascripts/dashboard.js.coffee
index dc0b9597d1..0229c588b4 100644
--- a/app/assets/javascripts/dashboard.js.coffee
+++ b/app/assets/javascripts/dashboard.js.coffee
@@ -1,3 +1,30 @@
-class @Dashboard
-  constructor: ->
-    ProjectsList.init()
+@Dashboard =
+  init: ->
+    this.initSearch()
+
+  initSearch: ->
+    @timer = null
+    $("#project-filter-form-field").keyup ->
+      clearTimeout(@timer)
+      @timer = setTimeout(Dashboard.filterResults, 500)
+
+  filterResults: =>
+    $('.projects-list-holder').css("opacity", '0.5')
+
+    form = null
+    form = $("#project-filter-form")
+    search = $("#project-filter-form-field").val()
+    project_filter_url = form.attr('action') + '?' + form.serialize()
+
+    $.ajax
+      type: "GET"
+      url: form.attr('action')
+      data: form.serialize()
+      complete: ->
+        $('.projects-list-holder').css("opacity", '1.0')
+      success: (data) ->
+        $('div.projects-list-holder').replaceWith(data.html)
+        # Change url so if user reload a page - search results are saved
+        history.replaceState {page: project_filter_url}, document.title, project_filter_url
+      dataType: "json"
+    #uiBox.find("ul.projects-list li.bottom").hide()
diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index 2cdf01d874..d4a2b74b14 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -58,7 +58,7 @@ class Dispatcher
         shortcut_handler = new ShortcutsNavigation()
         MergeRequests.init()
       when 'dashboard:show', 'root:show'
-        new Dashboard()
+        Dashboard.init()
       when 'dashboard:activity'
         new Activities()
       when 'dashboard:projects:starred'
diff --git a/app/assets/javascripts/issues.js.coffee b/app/assets/javascripts/issues.js.coffee
index 54e0074142..a0acf3028b 100644
--- a/app/assets/javascripts/issues.js.coffee
+++ b/app/assets/javascripts/issues.js.coffee
@@ -45,7 +45,7 @@
 
   filterResults: =>
     form = $("#issue_search_form")
-    search = $("#projects-list-filter").val()
+    search = $("#issue_search").val()
     $('.issues-holder').css("opacity", '0.5')
     issues_url = form.attr('action') + '?' + form.serialize()
 
diff --git a/app/assets/javascripts/projects_list.js.coffee b/app/assets/javascripts/projects_list.js.coffee
index 384b95118c..ebf7140b7e 100644
--- a/app/assets/javascripts/projects_list.js.coffee
+++ b/app/assets/javascripts/projects_list.js.coffee
@@ -1,35 +1,24 @@
-@ProjectsList =
-  init: ->
+class @ProjectsList
+  constructor: ->
     $(".projects-list .js-expand").on 'click', (e) ->
       e.preventDefault()
       list = $(this).closest('.projects-list')
       list.find("li").show()
       list.find("li.bottom").hide()
-    this.initSearch()
 
-  initSearch: ->
-    @timer = null
-    $("#projects-list-filter").keyup ->
-      clearTimeout(@timer)
-      @timer = setTimeout(ProjectsList.filterResults, 500)
+    $(".projects-list-filter").keyup ->
+      terms = $(this).val()
+      uiBox = $('div.projects-list-holder')
+      filterSelector = $(this).data('filter-selector') || 'span.filter-title'
 
-  filterResults: =>
-    form = $("#project-list-form")
-    search = $("#issue_search").val()
-    uiBox = $('div.projects-list-holder')
+      if terms == "" || terms == undefined
+        uiBox.find("ul.projects-list li").show()
+      else
+        uiBox.find("ul.projects-list li").each (index) ->
+          name = $(this).find(filterSelector).text()
 
-    $('.projects-list-holder').css("opacity", '0.5')
-
-    project_filter_url = form.attr('action') + '?' + form.serialize()
-    $.ajax
-      type: "GET"
-      url: form.attr('action')
-      data: form.serialize()
-      complete: ->
-        $('.projects-list-holder').css("opacity", '1.0')
-      success: (data) ->
-        $('.projects-list-holder').html(data.html)
-        # Change url so if user reload a page - search results are saved
-        history.replaceState {page: project_filter_url}, document.title, project_filter_url
-      dataType: "json"
-    uiBox.find("ul.projects-list li.bottom").hide()
+          if name.toLowerCase().search(terms.toLowerCase()) == -1
+            $(this).hide()
+          else
+            $(this).show()
+      uiBox.find("ul.projects-list li.bottom").hide()
diff --git a/app/assets/javascripts/user.js.coffee b/app/assets/javascripts/user.js.coffee
index eb7f7bb26b..ec4271b092 100644
--- a/app/assets/javascripts/user.js.coffee
+++ b/app/assets/javascripts/user.js.coffee
@@ -1,7 +1,7 @@
 class @User
   constructor: ->
     $('.profile-groups-avatars').tooltip("placement": "top")
-    ProjectsList.init()
+    new ProjectsList()
 
     $('.hide-project-limit-message').on 'click', (e) ->
       path = '/'
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c189f49895..48b1f95acb 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -277,9 +277,9 @@ class ApplicationController < ActionController::Base
     }
   end
 
-  def view_to_html_string(partial, locals = nil)
+  def view_to_html_string(partial, locals = {})
     render_to_string(
-      partial: partial,
+      partial,
       locals: locals,
       layout: false,
       formats: [:html]
diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb
index 2f56228ff7..cd3a25866a 100644
--- a/app/controllers/dashboard/projects_controller.rb
+++ b/app/controllers/dashboard/projects_controller.rb
@@ -24,7 +24,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
       end
       format.json do
         render json: {
-          html: view_to_html_string("dashboard/projects/projects", locals: { projects: @projects })
+          html: view_to_html_string("dashboard/projects/_projects", locals: { projects: @projects })
         }
       end
     end
@@ -34,6 +34,13 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
     @projects = current_user.starred_projects
     @projects = @projects.includes(:namespace, :forked_from_project, :tags)
     @projects = @projects.sort(@sort = params[:sort])
+
+    terms = params['filter_projects']
+
+    if terms.present?
+      @projects = @projects.search(terms)
+    end
+
     @projects = @projects.page(params[:page]).per(PER_PAGE)
     @last_push = current_user.recent_push
     @groups = []
@@ -42,8 +49,9 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
       format.html
 
       format.json do
-        load_events
-        pager_json("events/_events", @events.count)
+        render json: {
+          html: view_to_html_string("dashboard/projects/projects", locals: { projects: @projects })
+        }
       end
     end
   end
diff --git a/app/controllers/explore/projects_controller.rb b/app/controllers/explore/projects_controller.rb
index 2689bf4f1e..a5aeaed66c 100644
--- a/app/controllers/explore/projects_controller.rb
+++ b/app/controllers/explore/projects_controller.rb
@@ -11,14 +11,14 @@ class Explore::ProjectsController < Explore::ApplicationController
   end
 
   def trending
-    @projects = TrendingProjectsFinder.new.execute(current_user)
-    @projects = @projects.non_archived
-    @projects = @projects.page(params[:page]).per(PER_PAGE)
+    @trending_projects = TrendingProjectsFinder.new.execute(current_user)
+    @trending_projects = @trending_projects.non_archived
+    @trending_projects = @trending_projects.page(params[:page]).per(PER_PAGE)
   end
 
   def starred
-    @projects = ProjectsFinder.new.execute(current_user)
-    @projects = @projects.reorder('star_count DESC')
-    @projects = @projects.page(params[:page]).per(PER_PAGE)
+    @starred_projects = ProjectsFinder.new.execute(current_user)
+    @starred_projects = @starred_projects.reorder('star_count DESC')
+    @starred_projects = @starred_projects.page(params[:page]).per(PER_PAGE)
   end
 end
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index ad6b3eae93..90475c17c1 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -41,6 +41,7 @@ class GroupsController < Groups::ApplicationController
   def show
     @last_push = current_user.recent_push if current_user
     @projects = @projects.includes(:namespace)
+    @projects = @projects.page(params[:page]).per(PER_PAGE)
 
     respond_to do |format|
       format.html
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 280228dbcc..6055b60608 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -4,8 +4,9 @@ class UsersController < ApplicationController
 
   def show
     @contributed_projects = contributed_projects.joined(@user).reject(&:forked?)
-
+    
     @projects = PersonalProjectsFinder.new(@user).execute(current_user)
+    @projects = @projects.page(params[:page]).per(PER_PAGE)
 
     @groups = @user.groups.order_id_desc
 
diff --git a/app/models/event.rb b/app/models/event.rb
index 4be23a1cf7..9a0bbf50f8 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -49,7 +49,7 @@ class Event < ActiveRecord::Base
   scope :code_push, -> { where(action: PUSHED) }
 
   scope :in_projects, ->(projects) do
-    where(project_id: projects.select(:id).reorder(nil)).recent
+    where(project_id: projects.map(&:id)).recent
   end
 
   scope :with_associations, -> { includes(project: :namespace) }
diff --git a/app/views/dashboard/_projects_head.html.haml b/app/views/dashboard/_projects_head.html.haml
index ab2da1824c..911f57f69e 100644
--- a/app/views/dashboard/_projects_head.html.haml
+++ b/app/views/dashboard/_projects_head.html.haml
@@ -13,9 +13,9 @@
         Explore Projects
 
   .nav-controls
-    = form_tag '', method: :get, class: 'project-list-form', id: 'project-list-form' do |f|
+    = form_tag request.original_url, method: :get, class: 'project-filter-form', id: 'project-filter-form' do |f|
       .append-right-10.hidden-xs.hidden-sm
-        = search_field_tag :filter_projects, params[:filter_projects], placeholder: 'Filter by name...', class: 'projects-list-filter form-control search-text-input', spellcheck: false, id: 'projects-list-filter'
+        = search_field_tag :filter_projects, params[:filter_projects], placeholder: 'Filter by name...', class: 'project-filter-form-field form-control search-text-input', spellcheck: false, id: 'project-filter-form-field'
         - if current_user.can_create_project?
           = link_to new_project_path, class: 'btn btn-new' do
             = icon('plus')
diff --git a/app/views/dashboard/projects/_projects.html.haml b/app/views/dashboard/projects/_projects.html.haml
index c08247cd9a..933a3edd0f 100644
--- a/app/views/dashboard/projects/_projects.html.haml
+++ b/app/views/dashboard/projects/_projects.html.haml
@@ -1,6 +1,6 @@
 .projects-list-holder
 
-  = render 'shared/projects/list', ci: true
+  = render 'shared/projects/list', projects: @projects, ci: true
 
   :javascript
-    ProjectsList.init()
+    Dashboard.init()
diff --git a/app/views/explore/projects/_projects.html.haml b/app/views/explore/projects/_projects.html.haml
index b64a491876..669079e952 100644
--- a/app/views/explore/projects/_projects.html.haml
+++ b/app/views/explore/projects/_projects.html.haml
@@ -1,6 +1,6 @@
-- if @projects.any?
+- if projects.any?
   .public-projects
-    = render 'shared/projects/list'
+    = render 'shared/projects/list', projects: projects
 - else
   .nothing-here-block
     No such projects
diff --git a/app/views/explore/projects/starred.html.haml b/app/views/explore/projects/starred.html.haml
index 0bdd0a57fe..8450a1394c 100644
--- a/app/views/explore/projects/starred.html.haml
+++ b/app/views/explore/projects/starred.html.haml
@@ -7,5 +7,5 @@
   = render 'explore/head'
 
 = render 'explore/projects/nav'
-= render 'projects', projects: @projects
-= paginate @projects, theme: 'gitlab'
+= render 'projects', projects: @starred_projects
+= paginate @projects, theme: 'gitlab' if @projects
diff --git a/app/views/explore/projects/trending.html.haml b/app/views/explore/projects/trending.html.haml
index ec46175510..adcda81006 100644
--- a/app/views/explore/projects/trending.html.haml
+++ b/app/views/explore/projects/trending.html.haml
@@ -7,4 +7,4 @@
   = render 'explore/head'
 
 = render 'explore/projects/nav'
-= render 'projects', projects: @projects
+= render 'projects', projects: @trending_projects
diff --git a/app/views/projects/show.atom.builder b/app/views/projects/show.atom.builder
index 2468509242..9b3d3f069d 100644
--- a/app/views/projects/show.atom.builder
+++ b/app/views/projects/show.atom.builder
@@ -4,7 +4,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
   xml.link    href: namespace_project_url(@project.namespace, @project, format: :atom, private_token: current_user.try(:private_token)), rel: "self", type: "application/atom+xml"
   xml.link    href: namespace_project_url(@project.namespace, @project), rel: "alternate", type: "text/html"
   xml.id      namespace_project_url(@project.namespace, @project)
-  xml.updated @events[0].updated_at.xmlschema if @events[0?
+  xml.updated @events[0].updated_at.xmlschema if @events[0]
 
   @events.each do |event|
     event_to_atom(xml, event)
diff --git a/app/views/shared/projects/_list.html.haml b/app/views/shared/projects/_list.html.haml
index 80795063f6..83188e5813 100644
--- a/app/views/shared/projects/_list.html.haml
+++ b/app/views/shared/projects/_list.html.haml
@@ -8,20 +8,22 @@
 - show_last_commit_as_description = false unless local_assigns[:show_last_commit_as_description] == true
 
 %ul.projects-list
-  - if @projects.any?
-    - @projects.each_with_index do |project, i|
+  - if projects.any?
+    - projects.each_with_index do |project, i|
       - css_class = (i >= projects_limit) ? 'hide' : nil
       = render "shared/projects/project", project: project, skip_namespace: skip_namespace,
         avatar: avatar, stars: stars, css_class: css_class, ci: ci, use_creator_avatar: use_creator_avatar,
         forks: forks, show_last_commit_as_description: show_last_commit_as_description
 
-    - if @projects.size > projects_limit
+    - if projects.size > projects_limit
       %li.bottom.center
         .light
-          #{projects_limit} of #{pluralize(@projects.count, 'project')} displayed.
+          #{projects_limit} of #{pluralize(projects.count, 'project')} displayed.
           = link_to '#', class: 'js-expand' do
             Show all
-    = paginate @projects, theme: "gitlab"
+    = paginate projects, theme: "gitlab" if !projects.kind_of?(Array)
   - else
     %h3 No projects found
-    %p.slead Try searching for a different project.
+
+:javascript
+  new ProjectsList();

From 74a4ff614335ce82d92a7501227898053f806b6e Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Thu, 4 Feb 2016 13:24:43 -0500
Subject: [PATCH 5/8] Remove js line

---
 app/assets/javascripts/dashboard.js.coffee | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/javascripts/dashboard.js.coffee b/app/assets/javascripts/dashboard.js.coffee
index 0229c588b4..e96b84147b 100644
--- a/app/assets/javascripts/dashboard.js.coffee
+++ b/app/assets/javascripts/dashboard.js.coffee
@@ -27,4 +27,3 @@
         # Change url so if user reload a page - search results are saved
         history.replaceState {page: project_filter_url}, document.title, project_filter_url
       dataType: "json"
-    #uiBox.find("ul.projects-list li.bottom").hide()

From 3f1bd844f1f645d3d97caec4aa2504fde63b31fd Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Thu, 4 Feb 2016 14:02:19 -0500
Subject: [PATCH 6/8] Implement changes from MR feedback

---
 app/controllers/explore/projects_controller.rb | 12 ++++++------
 app/views/dashboard/_projects_head.html.haml   | 14 +++++++-------
 app/views/explore/projects/starred.html.haml   |  2 +-
 app/views/explore/projects/trending.html.haml  |  2 +-
 app/views/shared/projects/_list.html.haml      |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/controllers/explore/projects_controller.rb b/app/controllers/explore/projects_controller.rb
index a5aeaed66c..2689bf4f1e 100644
--- a/app/controllers/explore/projects_controller.rb
+++ b/app/controllers/explore/projects_controller.rb
@@ -11,14 +11,14 @@ class Explore::ProjectsController < Explore::ApplicationController
   end
 
   def trending
-    @trending_projects = TrendingProjectsFinder.new.execute(current_user)
-    @trending_projects = @trending_projects.non_archived
-    @trending_projects = @trending_projects.page(params[:page]).per(PER_PAGE)
+    @projects = TrendingProjectsFinder.new.execute(current_user)
+    @projects = @projects.non_archived
+    @projects = @projects.page(params[:page]).per(PER_PAGE)
   end
 
   def starred
-    @starred_projects = ProjectsFinder.new.execute(current_user)
-    @starred_projects = @starred_projects.reorder('star_count DESC')
-    @starred_projects = @starred_projects.page(params[:page]).per(PER_PAGE)
+    @projects = ProjectsFinder.new.execute(current_user)
+    @projects = @projects.reorder('star_count DESC')
+    @projects = @projects.page(params[:page]).per(PER_PAGE)
   end
 end
diff --git a/app/views/dashboard/_projects_head.html.haml b/app/views/dashboard/_projects_head.html.haml
index 911f57f69e..91712ce6fc 100644
--- a/app/views/dashboard/_projects_head.html.haml
+++ b/app/views/dashboard/_projects_head.html.haml
@@ -13,10 +13,10 @@
         Explore Projects
 
   .nav-controls
-    = form_tag request.original_url, method: :get, class: 'project-filter-form', id: 'project-filter-form' do |f|
-      .append-right-10.hidden-xs.hidden-sm
-        = search_field_tag :filter_projects, params[:filter_projects], placeholder: 'Filter by name...', class: 'project-filter-form-field form-control search-text-input', spellcheck: false, id: 'project-filter-form-field'
-        - if current_user.can_create_project?
-          = link_to new_project_path, class: 'btn btn-new' do
-            = icon('plus')
-            New Project
+    .pull-right
+      = form_tag request.original_url, method: :get, class: 'pull-left project-filter-form', id: 'project-filter-form' do |f|
+        = search_field_tag :filter_projects, params[:filter_projects], placeholder: 'Filter by name...', class: 'pull-left form-control project-filter-form-field form-control', spellcheck: false, id: 'project-filter-form-field'
+      - if current_user.can_create_project?
+        = link_to new_project_path, class: 'btn btn-new pull-left' do
+          = icon('plus')
+          New Project
diff --git a/app/views/explore/projects/starred.html.haml b/app/views/explore/projects/starred.html.haml
index 8450a1394c..1b5269c7b6 100644
--- a/app/views/explore/projects/starred.html.haml
+++ b/app/views/explore/projects/starred.html.haml
@@ -7,5 +7,5 @@
   = render 'explore/head'
 
 = render 'explore/projects/nav'
-= render 'projects', projects: @starred_projects
+= render 'projects', projects: @projects
 = paginate @projects, theme: 'gitlab' if @projects
diff --git a/app/views/explore/projects/trending.html.haml b/app/views/explore/projects/trending.html.haml
index adcda81006..ec46175510 100644
--- a/app/views/explore/projects/trending.html.haml
+++ b/app/views/explore/projects/trending.html.haml
@@ -7,4 +7,4 @@
   = render 'explore/head'
 
 = render 'explore/projects/nav'
-= render 'projects', projects: @trending_projects
+= render 'projects', projects: @projects
diff --git a/app/views/shared/projects/_list.html.haml b/app/views/shared/projects/_list.html.haml
index 83188e5813..67edb264b7 100644
--- a/app/views/shared/projects/_list.html.haml
+++ b/app/views/shared/projects/_list.html.haml
@@ -15,7 +15,7 @@
         avatar: avatar, stars: stars, css_class: css_class, ci: ci, use_creator_avatar: use_creator_avatar,
         forks: forks, show_last_commit_as_description: show_last_commit_as_description
 
-    - if projects.size > projects_limit
+    - if projects.size > projects_limit && projects.kind_of?(Array)
       %li.bottom.center
         .light
           #{projects_limit} of #{pluralize(projects.count, 'project')} displayed.

From f8526fef0b2bde3b517ee993e5cef48c6c8f5da7 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 5 Feb 2016 11:10:44 +0100
Subject: [PATCH 7/8] Fix project filter form rendering

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/framework/nav.scss    |  4 ++++
 app/views/dashboard/_projects_head.html.haml | 14 +++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index e6c59f5a29..252a586358 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -85,6 +85,10 @@
       display: inline-block;
     }
 
+    > form {
+      display: inline-block;
+    }
+
     input {
       height: 34px;
       display: inline-block;
diff --git a/app/views/dashboard/_projects_head.html.haml b/app/views/dashboard/_projects_head.html.haml
index 91712ce6fc..d46998ec1e 100644
--- a/app/views/dashboard/_projects_head.html.haml
+++ b/app/views/dashboard/_projects_head.html.haml
@@ -13,10 +13,10 @@
         Explore Projects
 
   .nav-controls
-    .pull-right
-      = form_tag request.original_url, method: :get, class: 'pull-left project-filter-form', id: 'project-filter-form' do |f|
-        = search_field_tag :filter_projects, params[:filter_projects], placeholder: 'Filter by name...', class: 'pull-left form-control project-filter-form-field form-control', spellcheck: false, id: 'project-filter-form-field'
-      - if current_user.can_create_project?
-        = link_to new_project_path, class: 'btn btn-new pull-left' do
-          = icon('plus')
-          New Project
+    = form_tag request.original_url, method: :get, class: 'project-filter-form', id: 'project-filter-form' do |f|
+      = search_field_tag :filter_projects, params[:filter_projects], placeholder: 'Filter by name...', class: 'project-filter-form-field form-control input-short', spellcheck: false, id: 'project-filter-form-field'
+    = render 'explore/projects/dropdown'
+    - if current_user.can_create_project?
+      = link_to new_project_path, class: 'btn btn-new' do
+        = icon('plus')
+        New Project

From f1102b3373ecd294e625edf541d47552d5dc489f Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Fri, 5 Feb 2016 09:02:50 -0500
Subject: [PATCH 8/8] Frontend changes from MR feedback

---
 app/assets/javascripts/dashboard.js.coffee | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/dashboard.js.coffee b/app/assets/javascripts/dashboard.js.coffee
index e96b84147b..dd29508831 100644
--- a/app/assets/javascripts/dashboard.js.coffee
+++ b/app/assets/javascripts/dashboard.js.coffee
@@ -4,12 +4,13 @@
 
   initSearch: ->
     @timer = null
-    $("#project-filter-form-field").keyup ->
+    $("#project-filter-form-field").on('keyup', ->
       clearTimeout(@timer)
       @timer = setTimeout(Dashboard.filterResults, 500)
+    )
 
   filterResults: =>
-    $('.projects-list-holder').css("opacity", '0.5')
+    $('.projects-list-holder').fadeTo(250, 0.5)
 
     form = null
     form = $("#project-filter-form")
@@ -21,7 +22,7 @@
       url: form.attr('action')
       data: form.serialize()
       complete: ->
-        $('.projects-list-holder').css("opacity", '1.0')
+        $('.projects-list-holder').fadeTo(250, 1)
       success: (data) ->
         $('div.projects-list-holder').replaceWith(data.html)
         # Change url so if user reload a page - search results are saved