diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-02-05 19:29:50 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-02-05 19:29:50 +0300 |
| commit | fed80f25f5fbd5c984b8a3dd6e04e683b11891ce (patch) | |
| tree | 372eda98e89f584757c46a6c4d09d97899860afb /app | |
| parent | b0d5aeaa55d1af260a35108b3533d6bd4164bdb4 (diff) | |
| parent | 1a9630acc5acc102fb4d31e35af844f4dabb7656 (diff) | |
Merge branch 'fix-double-page' into 'master'
Fix double paging
See merge request !2727
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/dashboard/projects_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/explore/projects/index.html.haml | 1 | ||||
| -rw-r--r-- | app/views/explore/projects/starred.html.haml | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb index cd3a25866af..0bcc78a8bc7 100644 --- 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 diff --git a/app/views/explore/projects/index.html.haml b/app/views/explore/projects/index.html.haml index bee8518d57a..dca75498573 100644 --- 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" diff --git a/app/views/explore/projects/starred.html.haml b/app/views/explore/projects/starred.html.haml index 1b5269c7b68..ec461755103 100644 --- 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 |