diff options
author | Martin Wortschack <mwortschack@gitlab.com> | 2018-10-04 10:55:37 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-10-04 10:55:37 +0300 |
commit | 337b2c80f32cbd9986843a04296252d40f9847c5 (patch) | |
tree | 44544a40e742e8009ef90a9590ba0d4543449df5 /app/controllers/users_controller.rb | |
parent | 14ed916cf2ffe82ca11b8d25a88cb20f88823734 (diff) |
Resolve "Add new "Overview" tab on user profile page"
Diffstat (limited to 'app/controllers/users_controller.rb')
-rw-r--r-- | app/controllers/users_controller.rb | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index e509098d778..d16240af404 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -29,11 +29,17 @@ class UsersController < ApplicationController format.json do load_events - pager_json("events/_events", @events.count) + pager_json("events/_events", @events.count, events: @events) end end end + def activity + respond_to do |format| + format.html { render 'show' } + end + end + def groups load_groups @@ -53,9 +59,7 @@ class UsersController < ApplicationController respond_to do |format| format.html { render 'show' } format.json do - render json: { - html: view_to_html_string("shared/projects/_list", projects: @projects) - } + pager_json("shared/projects/_list", @projects.count, projects: @projects) end end end @@ -125,6 +129,7 @@ class UsersController < ApplicationController @projects = PersonalProjectsFinder.new(user).execute(current_user) .page(params[:page]) + .per(params[:limit]) prepare_projects_for_rendering(@projects) end |