Commit fed80f25 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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
parents b0d5aeaa 1a9630ac
...@@ -50,7 +50,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController ...@@ -50,7 +50,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
format.json do format.json do
render json: { 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
end end
......
...@@ -13,4 +13,3 @@ ...@@ -13,4 +13,3 @@
= render 'filter' = render 'filter'
= render 'projects', projects: @projects = render 'projects', projects: @projects
= paginate @projects, theme: "gitlab"
...@@ -8,4 +8,3 @@ ...@@ -8,4 +8,3 @@
= render 'explore/projects/nav' = render 'explore/projects/nav'
= render 'projects', projects: @projects = render 'projects', projects: @projects
= paginate @projects, theme: 'gitlab' if @projects
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment