diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-03-02 19:13:50 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2016-03-10 10:38:36 -0300 |
| commit | 5551ccd7201ea6b45a2e2721502ba55e8f525d8f (patch) | |
| tree | 65d9b9c37f1ed839d4e16953207e82a9629dd9dc /app/controllers/users_controller.rb | |
| parent | f2a9ee258e0ee3a6fe0cb614e4b73c56dcd7339d (diff) | |
| download | gitlab-ce-5551ccd7201ea6b45a2e2721502ba55e8f525d8f.tar.gz | |
Code improvements
Diffstat (limited to 'app/controllers/users_controller.rb')
| -rw-r--r-- | app/controllers/users_controller.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index e10c633690f..d26a1ce6737 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -3,6 +3,16 @@ class UsersController < ApplicationController before_action :set_user def show +<<<<<<< HEAD +======= + @contributed_projects = contributed_projects.joined(@user).reject(&:forked?) + + @projects = PersonalProjectsFinder.new(@user).execute(current_user) + @projects = @projects.page(params[:page]).per(PER_PAGE) + + @groups = @user.groups.order_id_desc + +>>>>>>> Code improvements respond_to do |format| format.html |