kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Dmitriy Zaporozhets 2016-02-05 16:29:50 +00:00
parent b0d5aeaa55 1a9630acc5
commit fed80f25f5
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/dashboard/projects_controller.rb
View File

@ -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

1
app/views/explore/projects/index.html.haml
View File

@ -13,4 +13,3 @@
= render 'filter'
= render 'projects', projects: @projects
= paginate @projects, theme: "gitlab"

1
app/views/explore/projects/starred.html.haml
View File

@ -8,4 +8,3 @@
= render 'explore/projects/nav'
= render 'projects', projects: @projects
= paginate @projects, theme: 'gitlab' if @projects