Merge branch 'fix-double-page' into 'master'

Fix double paging ![Screen_Shot_2016-02-05_at_10.27.34_AM](/uploads/a21ad6c47ddecad29d377497ee2a167d/Screen_Shot_2016-02-05_at_10.27.34_AM.png) ![Screen_Shot_2016-02-05_at_10.27.44_AM](/uploads/3badb423df25f009886138c65cfe8347/Screen_Shot_2016-02-05_at_10.27.44_AM.png) See merge request !2727

Merge branch 'fix-double-page' into 'master'
fed80f25 · Dmitriy Zaporozhets · b0d5aeaa · 1a9630ac · fed80f25 · fed80f25
Commit fed80f25 authored Feb 05, 2016 by Dmitriy Zaporozhets
Showing with 1 addition and 3 deletions

projects_controller.rb app/controllers/dashboard/projects_controller.rb +1 -1

index.html.haml app/views/explore/projects/index.html.haml +0 -1

starred.html.haml app/views/explore/projects/starred.html.haml +0 -1

No files found.
--- a/app/controllers/dashboard/projects_controller.rb
+++ b/app/controllers/dashboard/projects_controller.rb
@@ -50,7 +50,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController

      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

--- a/app/views/explore/projects/index.html.haml
+++ b/app/views/explore/projects/index.html.haml
@@ -13,4 +13,3 @@
  = render 'filter'

 = render 'projects', projects: @projects
-= paginate @projects, theme: "gitlab"
--- a/app/views/explore/projects/starred.html.haml
+++ b/app/views/explore/projects/starred.html.haml
@@ -8,4 +8,3 @@

 = render 'explore/projects/nav'
 = render 'projects', projects: @projects
-= paginate @projects, theme: 'gitlab' if @projects