summaryrefslogtreecommitdiff
path: root/app/controllers/users_controller.rb
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-03-17 15:38:41 +0000
committerPhil Hughes <me@iamphill.com>2017-03-18 10:58:46 +0000
commit652d80458af1ea4552ae5095e212ef770a6b229d (patch)
tree9bc528d94d0ccd2b007176075e5ef242ede23c7a /app/controllers/users_controller.rb
parent4bf4612cfbe73845391375bf721592426d7b4181 (diff)
downloadgitlab-ce-652d80458af1ea4552ae5095e212ef770a6b229d.tar.gz
Fixed pagination in projects & snippets on user page
Changed it from being json links to normal links & then doing a AJAX request to get the content. Closes #29624
Diffstat (limited to 'app/controllers/users_controller.rb')
-rw-r--r--app/controllers/users_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6e29f1e8a65..2683614d2e8 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -39,7 +39,7 @@ class UsersController < ApplicationController
format.html { render 'show' }
format.json do
render json: {
- html: view_to_html_string("shared/projects/_list", projects: @projects, remote: true)
+ html: view_to_html_string("shared/projects/_list", projects: @projects)
}
end
end
@@ -65,7 +65,7 @@ class UsersController < ApplicationController
format.html { render 'show' }
format.json do
render json: {
- html: view_to_html_string("snippets/_snippets", collection: @snippets, remote: true)
+ html: view_to_html_string("snippets/_snippets", collection: @snippets)
}
end
end